diff -Nru zfs-linux-2.2.0/debian/changelog zfs-linux-2.2.0/debian/changelog --- zfs-linux-2.2.0/debian/changelog 2023-10-24 12:25:21.000000000 +0000 +++ zfs-linux-2.2.0/debian/changelog 2023-12-09 19:10:21.000000000 +0000 @@ -1,3 +1,10 @@ +zfs-linux (2.2.0-0ubuntu1~23.10.1) mantic; urgency=medium + + * d/p/u/zed-fix-typo-ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT.patch: + fix typo in configuration option in zed.rc (LP: #2046082) + + -- Mauricio Faria de Oliveira Sat, 09 Dec 2023 16:10:21 -0300 + zfs-linux (2.2.0-0ubuntu1~23.10) mantic; urgency=medium * New upstream release. LP: #2040181 diff -Nru zfs-linux-2.2.0/debian/patches/series zfs-linux-2.2.0/debian/patches/series --- zfs-linux-2.2.0/debian/patches/series 2023-10-24 12:25:21.000000000 +0000 +++ zfs-linux-2.2.0/debian/patches/series 2023-12-09 19:10:21.000000000 +0000 @@ -27,3 +27,4 @@ ubuntu/4751-suppress-types.patch fixup-abi.patch 4630-ubsan-Support-varlen-arrays-at-end-of-struct-as-1-or.patch +ubuntu/zed-fix-typo-ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT.patch diff -Nru zfs-linux-2.2.0/debian/patches/ubuntu/zed-fix-typo-ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT.patch zfs-linux-2.2.0/debian/patches/ubuntu/zed-fix-typo-ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT.patch --- zfs-linux-2.2.0/debian/patches/ubuntu/zed-fix-typo-ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT.patch 1970-01-01 00:00:00.000000000 +0000 +++ zfs-linux-2.2.0/debian/patches/ubuntu/zed-fix-typo-ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT.patch 2023-12-09 19:10:21.000000000 +0000 @@ -0,0 +1,82 @@ +From 3c7650491b9ac2d1c7610c9421aa1d2d2db8c74b Mon Sep 17 00:00:00 2001 +From: Mauricio Faria de Oliveira +Date: Fri, 8 Dec 2023 21:32:35 -0300 +Subject: [PATCH] zed: fix typo in variable + ZED_POWER_OFF_ENCLO*US*RE_SLOT_ON_FAULT + +Replace ENCLO_US_RE with ENCLO_SU_RE in the name of the variable. + +Note this changes the user-visible string in zed.rc, thus might +break current users with the wrong string, but it's ~2 months +since zfs-2.2.0 tag is out, thus should not be widespread yet. + +Mechanical change: + + $ grep -rl ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT + cmd/zed/zed.d/zed.rc + cmd/zed/zed.d/statechange-slot_off.sh + + $ sed -i 's/ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT/ + ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT/g' \ + cmd/zed/zed.d/zed.rc \ + cmd/zed/zed.d/statechange-slot_off.sh + + $ grep -rl ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT + $ + +Fixes 11fbcacf37d1a66c7a40bb8920c70ce9a87270ea +("zed: Add zedlet to power off slot when drive is faulted") + +Reviewed-by: Tony Hutter +Reviewed-by: Brian Behlendorf +Signed-off-by: Mauricio Faria de Oliveira +Closes #15651 + +Origin: backport, https://github.com/openzfs/zfs/commit/3c7650491b9ac2d1c7610c9421aa1d2d2db8c74b +[mfo: backport: remove the trailing context lines in zed.rc (end of file)] +--- + cmd/zed/zed.d/statechange-slot_off.sh | 6 +++--- + cmd/zed/zed.d/zed.rc | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cmd/zed/zed.d/statechange-slot_off.sh b/cmd/zed/zed.d/statechange-slot_off.sh +index 150012abe71a..06acce93b8aa 100755 +--- a/cmd/zed/zed.d/statechange-slot_off.sh ++++ b/cmd/zed/zed.d/statechange-slot_off.sh +@@ -5,7 +5,7 @@ + # + # Bad SCSI disks can often "disappear and reappear" causing all sorts of chaos + # as they flip between FAULTED and ONLINE. If +-# ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT is set in zed.rc, and the disk gets ++# ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT is set in zed.rc, and the disk gets + # FAULTED, then power down the slot via sysfs: + # + # /sys/class/enclosure///power_status +@@ -19,7 +19,7 @@ + # Exit codes: + # 0: slot successfully powered off + # 1: enclosure not available +-# 2: ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT disabled ++# 2: ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT disabled + # 3: vdev was not FAULTED + # 4: The enclosure sysfs path passed from ZFS does not exist + # 5: Enclosure slot didn't actually turn off after we told it to +@@ -32,7 +32,7 @@ if [ ! -d /sys/class/enclosure ] ; then + exit 1 + fi + +-if [ "${ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT}" != "1" ] ; then ++if [ "${ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT}" != "1" ] ; then + exit 2 + fi + +diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc +index acdfabc8ded2..bc269b155d76 100644 +--- a/cmd/zed/zed.d/zed.rc ++++ b/cmd/zed/zed.d/zed.rc +@@ -146,4 +146,4 @@ ZED_SYSLOG_SUBCLASS_EXCLUDE="history_event" + # Power off the drive's slot in the enclosure if it becomes FAULTED. This can + # help silence misbehaving drives. This assumes your drive enclosure fully + # supports slot power control via sysfs. +-#ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT=1 ++#ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT=1