From c0a56dbc5e5283cd4341a7852b07201e2eda3272 Mon Sep 17 00:00:00 2001
From: Jan Houben <jan@et.tc>
Date: Wed, 7 Nov 2018 21:37:25 -0500
Subject: [PATCH] Cleanup initcpio hook

---
 build.sh                                 | 8 ++++++--
 conf.sh                                  | 3 ++-
 src/zfs-utils/PKGBUILD.sh                | 2 +-
 src/zfs-utils/zfs-utils.initcpio.install | 3 ---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index c700448..df54141 100755
--- a/build.sh
+++ b/build.sh
@@ -298,9 +298,9 @@ for (( a = 0; a < $#; a++ )); do
 done
 
 
-if [[ ${#commands[@]} -eq 0 || ${#modes[@]} -eq 0 ]]; then
+if [[ ${#commands[@]} -eq 0 && ${#modes[@]} -eq 0 ]]; then
     echo
-    error "A build mode and command must be selected!"
+    error "A build mode or command must be selected!"
     usage
 fi
 
@@ -329,6 +329,10 @@ if have_command "update_sums"; then
     azsha3=$(echo ${run_cmd_output} | awk '{ print $1 }')
     run_cmd_no_output "sed -e 's/^zfs_initcpio_install_hash.*/zfs_initcpio_install_hash=\"${azsha3}\"/g' -i ${script_dir}/conf.sh"
 
+    run_cmd_show_and_capture_output "sha256sum ${script_dir}/src/zfs-utils/zfs-utils.initcpio.zfsencryptssh.install"
+    azsha3=$(echo ${run_cmd_output} | awk '{ print $1 }')
+    run_cmd_no_output "sed -e 's/^zfs_initcpio_zfsencryptssh_install.*/zfs_initcpio_zfsencryptssh_install=\"${azsha3}\"/g' -i ${script_dir}/conf.sh"
+
     source_safe "${script_dir}/conf.sh"
 fi
 
diff --git a/conf.sh b/conf.sh
index a2753ff..3f666bf 100644
--- a/conf.sh
+++ b/conf.sh
@@ -9,8 +9,9 @@ spl_src_hash="4709a06e913bbbeb634161a8b68c3f879e5b6040c6c0c09b1f51042b3178c274"
 zfs_src_hash="720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848"
 
 zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
-zfs_initcpio_install_hash="6e5e905a322d0426acdcbc05c5651ec78ee7b874b96d3c429c80f68b061170c5"
+zfs_initcpio_install_hash="29a8a6d76fff01b71ef1990526785405d9c9410bdea417b08b56107210d00b10"
 zfs_initcpio_hook_hash="78e038f95639c209576e7fa182afd56ac11a695af9ebfa958709839ff1e274ce"
+zfs_initcpio_zfsencryptssh_install="29080a84e5d7e36e63c4412b98646043724621245b36e5288f5fed6914da5b68"
 
 # Notification address
 email="jeezusjr@gmail.com"
diff --git a/src/zfs-utils/PKGBUILD.sh b/src/zfs-utils/PKGBUILD.sh
index d9597e4..8b05c5b 100755
--- a/src/zfs-utils/PKGBUILD.sh
+++ b/src/zfs-utils/PKGBUILD.sh
@@ -27,7 +27,7 @@ sha256sums=("${zfs_src_hash}"
             "${zfs_bash_completion_hash}"
             "${zfs_initcpio_install_hash}"
             "${zfs_initcpio_hook_hash}"
-            "29080a84e5d7e36e63c4412b98646043724621245b36e5288f5fed6914da5b68")
+            "${zfs_initcpio_zfsencryptssh_install}")
 license=("CDDL")
 groups=("${archzfs_package_group}")
 provides=("zfs-utils"${git_provides})
diff --git a/src/zfs-utils/zfs-utils.initcpio.install b/src/zfs-utils/zfs-utils.initcpio.install
index 8b646a1..350377b 100644
--- a/src/zfs-utils/zfs-utils.initcpio.install
+++ b/src/zfs-utils/zfs-utils.initcpio.install
@@ -10,8 +10,6 @@ build() {
         spl
 
     map add_binary \
-        arcstat.py \
-        dbufstat.py \
         fsck.zfs \
         mount.zfs \
         seq \
@@ -22,7 +20,6 @@ build() {
         zinject \
         zpool \
         zstreamdump \
-        ztest \
         /lib/udev/vdev_id \
         /lib/udev/zvol_id \
         findmnt