aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/zed
diff options
context:
space:
mode:
authorDamian Szuberski <[email protected]>2022-01-07 01:07:54 +0100
committerGitHub <[email protected]>2022-01-06 16:07:54 -0800
commitc1d3be19d7646c2dfeec04a31c96542be77b9763 (patch)
tree72ca292f59dd912c1de7471158b932bad0746fcd /cmd/zed
parenta8f27ec6c5f89f721f0492ed7b07437ec439d83d (diff)
Add ShellCheck's `--enable=all` inside `cmd/`
The only exception is `cmd/vdev_id/vdev_id` which might be a subject of refactoring (see #12084) Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Ahelenia ZiemiaƄska <[email protected]> Signed-off-by: szubersk <[email protected]> Closes #12912
Diffstat (limited to 'cmd/zed')
-rw-r--r--cmd/zed/Makefile.am1
-rw-r--r--cmd/zed/zed.d/Makefile.am4
-rwxr-xr-xcmd/zed/zed.d/all-debug.sh1
-rwxr-xr-xcmd/zed/zed.d/all-syslog.sh1
-rwxr-xr-xcmd/zed/zed.d/data-notify.sh1
-rwxr-xr-xcmd/zed/zed.d/generic-notify.sh1
-rwxr-xr-xcmd/zed/zed.d/history_event-zfs-list-cacher.sh.in3
-rwxr-xr-xcmd/zed/zed.d/resilver_finish-start-scrub.sh1
-rwxr-xr-xcmd/zed/zed.d/scrub_finish-notify.sh1
-rwxr-xr-xcmd/zed/zed.d/statechange-led.sh42
-rwxr-xr-xcmd/zed/zed.d/statechange-notify.sh1
-rwxr-xr-xcmd/zed/zed.d/trim_finish-notify.sh1
-rw-r--r--cmd/zed/zed.d/zed-functions.sh4
-rw-r--r--cmd/zed/zed.d/zed.rc1
14 files changed, 40 insertions, 23 deletions
diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am
index 7b662994d..1492123e1 100644
--- a/cmd/zed/Makefile.am
+++ b/cmd/zed/Makefile.am
@@ -5,6 +5,7 @@ AM_CFLAGS += $(LIBUDEV_CFLAGS) $(LIBUUID_CFLAGS)
SUBDIRS = zed.d
SHELLCHECKDIRS = $(SUBDIRS)
+SHELLCHECK_OPTS = --enable=all
sbin_PROGRAMS = zed
diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
index 2c8173b3e..24efaa74f 100644
--- a/cmd/zed/zed.d/Makefile.am
+++ b/cmd/zed/zed.d/Makefile.am
@@ -10,6 +10,10 @@ dist_zedconf_DATA = \
zed-functions.sh \
zed.rc
+SHELLCHECKSCRIPTS = zed-functions.sh zed.rc
+SHELLCHECK_OPTS = --enable=all
+SHELLCHECK_SHELL = dash
+
zedexecdir = $(zfsexecdir)/zed.d
dist_zedexec_SCRIPTS = \
diff --git a/cmd/zed/zed.d/all-debug.sh b/cmd/zed/zed.d/all-debug.sh
index 824c9fe42..ba19b96b0 100755
--- a/cmd/zed/zed.d/all-debug.sh
+++ b/cmd/zed/zed.d/all-debug.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
#
# Log all environment variables to ZED_DEBUG_LOG.
#
diff --git a/cmd/zed/zed.d/all-syslog.sh b/cmd/zed/zed.d/all-syslog.sh
index ea108c47b..5f601144a 100755
--- a/cmd/zed/zed.d/all-syslog.sh
+++ b/cmd/zed/zed.d/all-syslog.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
#
# Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
# Copyright (c) 2020 by Delphix. All rights reserved.
diff --git a/cmd/zed/zed.d/data-notify.sh b/cmd/zed/zed.d/data-notify.sh
index 792d30a66..9846769b1 100755
--- a/cmd/zed/zed.d/data-notify.sh
+++ b/cmd/zed/zed.d/data-notify.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
#
# Send notification in response to a DATA error.
#
diff --git a/cmd/zed/zed.d/generic-notify.sh b/cmd/zed/zed.d/generic-notify.sh
index 9cf657e39..e73b05390 100755
--- a/cmd/zed/zed.d/generic-notify.sh
+++ b/cmd/zed/zed.d/generic-notify.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
#
# Send notification in response to a given zevent.
#
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 db40fa36d..8c5031a38 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
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
#
# Track changes to enumerated pools for use in early-boot
set -ef
@@ -72,7 +73,7 @@ PROPS="name,mountpoint,canmount,atime,relatime,devices,exec\
,org.openzfs.systemd:wanted-by,org.openzfs.systemd:required-by\
,org.openzfs.systemd:nofail,org.openzfs.systemd:ignore"
-"${ZFS}" list -H -t filesystem -o $PROPS -r "${ZEVENT_POOL}" > "${FSLIST_TMP}"
+"${ZFS}" list -H -t filesystem -o "${PROPS}" -r "${ZEVENT_POOL}" > "${FSLIST_TMP}"
# Sort the output so that it is stable
sort "${FSLIST_TMP}" -o "${FSLIST_TMP}"
diff --git a/cmd/zed/zed.d/resilver_finish-start-scrub.sh b/cmd/zed/zed.d/resilver_finish-start-scrub.sh
index c7cfd1ddb..cafce6fde 100755
--- a/cmd/zed/zed.d/resilver_finish-start-scrub.sh
+++ b/cmd/zed/zed.d/resilver_finish-start-scrub.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
# resilver_finish-start-scrub.sh
# Run a scrub after a resilver
#
diff --git a/cmd/zed/zed.d/scrub_finish-notify.sh b/cmd/zed/zed.d/scrub_finish-notify.sh
index 5c0124b8d..fc9dc23e0 100755
--- a/cmd/zed/zed.d/scrub_finish-notify.sh
+++ b/cmd/zed/zed.d/scrub_finish-notify.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
#
# Send notification in response to a RESILVER_FINISH or SCRUB_FINISH.
#
diff --git a/cmd/zed/zed.d/statechange-led.sh b/cmd/zed/zed.d/statechange-led.sh
index 26e6064fa..46bfc1b86 100755
--- a/cmd/zed/zed.d/statechange-led.sh
+++ b/cmd/zed/zed.d/statechange-led.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
#
# Turn off/on vdevs' enclosure fault LEDs when their pool's state changes.
#
@@ -126,6 +127,9 @@ state_to_val()
ONLINE)
echo 0
;;
+ *)
+ echo "invalid state: $state"
+ ;;
esac
}
@@ -138,26 +142,24 @@ nvme_dev_to_slot()
dev="$1"
# Get the address "0000:01:00.0"
- address=$(cat "/sys/class/block/$dev/device/address")
-
- # For each /sys/bus/pci/slots subdir that is an actual number
- # (rather than weird directories like "1-3/").
- # shellcheck disable=SC2010
- for i in $(ls /sys/bus/pci/slots/ | grep -E "^[0-9]+$") ; do
- this_address=$(cat "/sys/bus/pci/slots/$i/address")
-
- # The format of address is a little different between
- # /sys/class/block/$dev/device/address and
- # /sys/bus/pci/slots/
- #
- # address= "0000:01:00.0"
- # this_address = "0000:01:00"
- #
- if echo "$address" | grep -Eq ^"$this_address" ; then
- echo "/sys/bus/pci/slots/$i"
- break
- fi
- done
+ read -r address < "/sys/class/block/$dev/device/address"
+
+ find /sys/bus/pci/slots -regex '.*/[0-9]+/address$' | \
+ while read -r sys_addr; do
+ read -r this_address < "$sys_addr"
+
+ # The format of address is a little different between
+ # /sys/class/block/$dev/device/address and
+ # /sys/bus/pci/slots/
+ #
+ # address= "0000:01:00.0"
+ # this_address = "0000:01:00"
+ #
+ if echo "$address" | grep -Eq ^"$this_address" ; then
+ echo "${sys_addr%/*}"
+ break
+ fi
+ done
}
diff --git a/cmd/zed/zed.d/statechange-notify.sh b/cmd/zed/zed.d/statechange-notify.sh
index ab11dfbc9..c475fdb36 100755
--- a/cmd/zed/zed.d/statechange-notify.sh
+++ b/cmd/zed/zed.d/statechange-notify.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
#
# CDDL HEADER START
#
diff --git a/cmd/zed/zed.d/trim_finish-notify.sh b/cmd/zed/zed.d/trim_finish-notify.sh
index 8fdb64531..a9ea48962 100755
--- a/cmd/zed/zed.d/trim_finish-notify.sh
+++ b/cmd/zed/zed.d/trim_finish-notify.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck disable=SC2154
#
# Send notification in response to a TRIM_FINISH. The event
# will be received for each vdev in the pool which was trimmed.
diff --git a/cmd/zed/zed.d/zed-functions.sh b/cmd/zed/zed.d/zed-functions.sh
index eb59036cf..bbff9c008 100644
--- a/cmd/zed/zed.d/zed-functions.sh
+++ b/cmd/zed/zed.d/zed-functions.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# shellcheck disable=SC2039
+# shellcheck disable=SC2154,SC3043
# zed-functions.sh
#
# ZED helper functions for use in ZEDLETs
@@ -266,7 +266,7 @@ zed_notify_email()
| sed -e "s/@ADDRESS@/${ZED_EMAIL_ADDR}/g" \
-e "s/@SUBJECT@/${subject}/g")"
- # shellcheck disable=SC2086
+ # shellcheck disable=SC2086,SC2248
eval ${ZED_EMAIL_PROG} ${ZED_EMAIL_OPTS} < "${pathname}" >/dev/null 2>&1
rv=$?
if [ "${rv}" -ne 0 ]; then
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
index 9ac77f929..a8fdc86c3 100644
--- a/cmd/zed/zed.d/zed.rc
+++ b/cmd/zed/zed.d/zed.rc
@@ -3,6 +3,7 @@
#
# This file should be owned by root and permissioned 0600.
##
+# shellcheck disable=SC2034
##
# Absolute path to the debug output file.