diff options
| author | Ben Cordero <[email protected]> | 2019-12-29 19:25:01 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-12-29 11:25:00 -0800 |
| commit | 153db761979524e0d91ef3596d3d705aa5690148 (patch) | |
| tree | edfc227e6774493feac30536b5de125948c3820b /contrib/dracut | |
| parent | 2c47bd575a4b7b77f91355e49ec691b60ea2f46f (diff) | |
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
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Garrett Fields <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Signed-off-by: Ben Cordero <[email protected]>
Closes #9780
Diffstat (limited to 'contrib/dracut')
| -rwxr-xr-x | contrib/dracut/90zfs/zfs-load-key.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/dracut/90zfs/zfs-load-key.sh.in b/contrib/dracut/90zfs/zfs-load-key.sh.in index 4e945f14a..85e55c51b 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 |