From 5891aaec34b524229bc34c6a387ae6993f69c281 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Tue, 13 Jun 2023 11:57:53 +0200 Subject: [PATCH] /lib/zfs-linux/trim: don't exit 1 if last pool isn't nvme-only (Closes: #1030316) (cherry picked from debian-upstream[0] commit 8ed69adac193f6463832f6ae34b5ded88b8014d8) [0] https://salsa.debian.org/zfsonlinux-team/zfs Signed-off-by: Stoiko Ivanov --- debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim b/debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim index 341a2fb..a807ecc 100755 --- a/debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim +++ b/debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim @@ -60,7 +60,7 @@ do case "${ret}" in disable);; enable) trim_if_not_already_trimming "${pool}" ;; - -|auto) pool_is_nvme_only "${pool}" && trim_if_not_already_trimming "${pool}" ;; + -|auto) if pool_is_nvme_only "${pool}"; then trim_if_not_already_trimming "${pool}"; fi ;; *) cat > /dev/stderr <