From 3e30dc57c00521c456a53172141556252bbb7373 Mon Sep 17 00:00:00 2001 From: Ben Cordero Date: Fri, 27 Dec 2019 22:40:43 +0000 Subject: [PATCH] zfs-load-key.sh: ${ZFS} is not the zfs binary A change[1] was merged yesterday that should refer to the zfs binary in the initramfs, but is actually an unset shell variable. This commit changes this line to call `zfs` directly like the surrounding code. [1]: cb5b875b273235a4a3ed28e16f416d5bb8865166 Signed-off-by: Ben Cordero --- contrib/dracut/90zfs/zfs-load-key.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/dracut/90zfs/zfs-load-key.sh.in b/contrib/dracut/90zfs/zfs-load-key.sh.in index 4e945f14abbc..85e55c51bfa4 100755 --- a/contrib/dracut/90zfs/zfs-load-key.sh.in +++ b/contrib/dracut/90zfs/zfs-load-key.sh.in @@ -38,7 +38,7 @@ if [ "$(zpool list -H -o feature@encryption $(echo "${BOOTFS}" | awk -F\/ '{prin # if the root dataset has encryption enabled ENCRYPTIONROOT=$(zfs get -H -o value encryptionroot "${BOOTFS}") # where the key is stored (in a file or loaded via prompt) - KEYLOCATION=$(${ZFS} get -H -o value keylocation "${ENCRYPTIONROOT}") + KEYLOCATION=$(zfs get -H -o value keylocation "${ENCRYPTIONROOT}") if ! [ "${ENCRYPTIONROOT}" = "-" ]; then KEYSTATUS="$(zfs get -H -o value keystatus "${ENCRYPTIONROOT}")" # continue only if the key needs to be loaded