diff options
| author | Garrett Fields <[email protected]> | 2019-12-18 15:32:31 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-12-18 12:32:31 -0800 |
| commit | b8a899e94ff8464dc538dbcdd7864ed49ef279a8 (patch) | |
| tree | 1ac3c2ffaa37dc59f5786d7d2fccfe0c4e34e280 /contrib/initramfs | |
| parent | 7839c4b5e1e79e29f0df4ec9fe5e1e7182473e47 (diff) | |
Exchanged two "${ZFS} get -H -o value" commands
Initramfs uses "get_fs_value()" elsewhere.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Reviewed-by: Kjeld Schouten-Lebbing <[email protected]>
Signed-off-by: Garrett Fields <[email protected]>
Closes #9736
Diffstat (limited to 'contrib/initramfs')
| -rw-r--r-- | contrib/initramfs/scripts/zfs.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/initramfs/scripts/zfs.in b/contrib/initramfs/scripts/zfs.in index 554016062..4b04c4be4 100644 --- a/contrib/initramfs/scripts/zfs.in +++ b/contrib/initramfs/scripts/zfs.in @@ -410,11 +410,11 @@ decrypt_fs() if [ "$(zpool list -H -o feature@encryption $(echo "${fs}" | awk -F\/ '{print $1}'))" = 'active' ]; then # Determine dataset that holds key for root dataset - ENCRYPTIONROOT=$(${ZFS} get -H -o value encryptionroot "${fs}") + ENCRYPTIONROOT="$(get_fs_value "${fs}" encryptionroot)" # If root dataset is encrypted... if ! [ "${ENCRYPTIONROOT}" = "-" ]; then - KEYSTATUS="$(${ZFS} get -H -o value keystatus "${ENCRYPTIONROOT}")" + KEYSTATUS="$(get_fs_value "${ENCRYPTIONROOT}" keystatus)" # Continue only if the key needs to be loaded [ "$KEYSTATUS" = "unavailable" ] || return 0 TRY_COUNT=3 |