From aa80eeeeab9ac07cf74e465cd03192cd45ac05fe Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Fri, 20 Jun 2025 10:48:49 -0500 Subject: [PATCH] chore: remove unused/redundant zfs scrub services/timers (#269) --- .../lib/systemd/system/zfs-scrub-monthly@.timer | 12 ------------ .../lib/systemd/system/zfs-scrub-weekly@.timer | 12 ------------ ucore/usr/lib/systemd/system/zfs-scrub@.service | 15 --------------- 3 files changed, 39 deletions(-) delete mode 100644 ucore/usr/lib/systemd/system/zfs-scrub-monthly@.timer delete mode 100644 ucore/usr/lib/systemd/system/zfs-scrub-weekly@.timer delete mode 100644 ucore/usr/lib/systemd/system/zfs-scrub@.service diff --git a/ucore/usr/lib/systemd/system/zfs-scrub-monthly@.timer b/ucore/usr/lib/systemd/system/zfs-scrub-monthly@.timer deleted file mode 100644 index 961dc7f..0000000 --- a/ucore/usr/lib/systemd/system/zfs-scrub-monthly@.timer +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Monthly zpool scrub timer for %i -Documentation=man:zpool-scrub(8) - -[Timer] -OnCalendar=monthly -Persistent=true -RandomizedDelaySec=1h -Unit=zfs-scrub@%i.service - -[Install] -WantedBy=timers.target \ No newline at end of file diff --git a/ucore/usr/lib/systemd/system/zfs-scrub-weekly@.timer b/ucore/usr/lib/systemd/system/zfs-scrub-weekly@.timer deleted file mode 100644 index d4cd754..0000000 --- a/ucore/usr/lib/systemd/system/zfs-scrub-weekly@.timer +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Weekly zpool scrub timer for %i -Documentation=man:zpool-scrub(8) - -[Timer] -OnCalendar=weekly -Persistent=true -RandomizedDelaySec=1h -Unit=zfs-scrub@%i.service - -[Install] -WantedBy=timers.target \ No newline at end of file diff --git a/ucore/usr/lib/systemd/system/zfs-scrub@.service b/ucore/usr/lib/systemd/system/zfs-scrub@.service deleted file mode 100644 index 0eecc61..0000000 --- a/ucore/usr/lib/systemd/system/zfs-scrub@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=zpool scrub on %i -Documentation=man:zpool-scrub(8) -Requires=zfs.target -After=zfs.target -ConditionACPower=true -ConditionPathIsDirectory=/sys/module/zfs - -[Service] -EnvironmentFile=-@initconfdir@/zfs -ExecStart=/bin/sh -c '\ -if /usr/sbin/zpool status %i | grep -q "scrub in progress"; then\ -exec /usr/sbin/zpool wait -t scrub %i;\ -else exec /usr/sbin/zpool scrub -w %i; fi' -ExecStop=-/bin/sh -c '/usr/sbin/zpool scrub -p %i 2>/dev/null || true'