From 00aa8a2b0aa79ca0a7a4b57749143c6bc37d2815 Mon Sep 17 00:00:00 2001 From: bergware Date: Sat, 18 Mar 2023 20:46:08 +0100 Subject: [PATCH] TRIM: improved zfs listing --- plugins/dynamix/scripts/ssd_trim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix/scripts/ssd_trim b/plugins/dynamix/scripts/ssd_trim index 82a4d55c4..0edee4179 100755 --- a/plugins/dynamix/scripts/ssd_trim +++ b/plugins/dynamix/scripts/ssd_trim @@ -22,7 +22,7 @@ if ($argc==2 && $argv[1]=='cron') { // trim btrfs echo shell_exec("fstrim -va 2>/dev/null"); // trim zfs - exec("zpool status|grep -Po 'pool: \K.+'",$zfs_pools); + exec("zfs list -H|grep -Po '^\S+'",$zfs_pools); foreach ($zfs_pools as $pool) if ($pool) { exec("zpool trim -w $pool 2>/dev/null"); echo zfs_info($pool)."\n"; @@ -69,7 +69,7 @@ foreach ($mounts as $mount) { } // trim zfs file system -exec("zpool status|grep -Po 'pool: \K.+'",$zfs_pools); +exec("zfs list -H|grep -Po '^\S+'",$zfs_pools); foreach ($zfs_pools as $pool) if ($pool) { write("/mnt/$pool: ... \r"); exec("zpool trim -w $pool 2>/dev/null");