From 3c4193333b1c2de612c91cd53ecdfcf2964009ee Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Sun, 21 Dec 2025 21:51:40 +0100 Subject: [PATCH] zed.d, contrib: fix shellcheck errors in scripts Not sure why this was not caught by CI; perhaps my shellcheck is new enough to catch more things. Signed-off-by: Ivan Shapovalov --- cmd/zed/zed.d/history_event-zfs-list-cacher.sh.in | 1 + contrib/dracut/90zfs/mount-zfs.sh.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/zed/zed.d/history_event-zfs-list-cacher.sh.in b/cmd/zed/zed.d/history_event-zfs-list-cacher.sh.in index 8c5031a38..bf9970a00 100755 --- a/cmd/zed/zed.d/history_event-zfs-list-cacher.sh.in +++ b/cmd/zed/zed.d/history_event-zfs-list-cacher.sh.in @@ -21,6 +21,7 @@ zed_check_cmd "${ZFS}" sort diff # We lock the output file to avoid simultaneous writes. # If we run into trouble, log and drop the lock +# shellcheck disable=SC2329 abort_alter() { zed_log_msg "Error updating zfs-list.cache for ${ZEVENT_POOL}!" zed_unlock "${FSLIST}" diff --git a/contrib/dracut/90zfs/mount-zfs.sh.in b/contrib/dracut/90zfs/mount-zfs.sh.in index b0eb614a6..6005fd58e 100755 --- a/contrib/dracut/90zfs/mount-zfs.sh.in +++ b/contrib/dracut/90zfs/mount-zfs.sh.in @@ -97,7 +97,7 @@ fi if [ "$(zpool get -Ho value feature@encryption "${ZFS_POOL}")" = 'active' ]; then # if the root dataset has encryption enabled ENCRYPTIONROOT="$(zfs get -Ho value encryptionroot "${ZFS_DATASET}")" - if ! [ "${ENCRYPTIONROOT}" = "-" ]; then + if [ "${ENCRYPTIONROOT}" != "-" ]; then KEYSTATUS="$(zfs get -Ho value keystatus "${ENCRYPTIONROOT}")" # if the key needs to be loaded if [ "$KEYSTATUS" = "unavailable" ]; then