From 3b854534f0cca5e24a1576617afcd95547b6c41e Mon Sep 17 00:00:00 2001 From: Prawn Date: Sun, 20 Dec 2020 03:01:21 +0100 Subject: [PATCH] ZED/zfs-list-cacher.sh: don't exit on ignored event type Check for the history_event type instead. The zfs-list-cacher.sh script currently respects the event types excluded from syslog(!) in ZED_SYSLOG_SUBCLASS_EXCLUDE. This makes little sense in this single-purpose script and silently breaks when history_events are excluded from syslog, which is the default since 13d65987a9d9958de77422f5d9d25b47e486537d. Reviewed-by: Brian Behlendorf Signed-off-by: InsanePrawn Closes #11164 Closes #11347 --- cmd/zed/zed.d/history_event-zfs-list-cacher.sh.in | 2 +- 1 file changed, 1 insertion(+), 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 053b4414a..bf5a121f6 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 @@ -13,7 +13,7 @@ FSLIST="${FSLIST_DIR}/${ZEVENT_POOL}" [ -f "${ZED_ZEDLET_DIR}/zed.rc" ] && . "${ZED_ZEDLET_DIR}/zed.rc" . "${ZED_ZEDLET_DIR}/zed-functions.sh" -zed_exit_if_ignoring_this_event +[ "$ZEVENT_SUBCLASS" != "history_event" ] && exit 0 zed_check_cmd "${ZFS}" sort diff grep # If we are acting on a snapshot, we have nothing to do