From d343e5fe3982270a700ad92e48fb88d3e78ad5f9 Mon Sep 17 00:00:00 2001 From: Jarno Rankinen Date: Sun, 11 Aug 2024 18:49:46 +0300 Subject: [PATCH] Revert "Remove manual zfs timers, try ubuntu-latest" This reverts commit 4ba9fe4fa21fc042d1761b508937ad2d5bb3df9c. --- .github/workflows/build.yml | 2 +- build.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e49bdd..38b0a8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ env: jobs: build_push_aurora: name: Build and publish SB image with ZFS - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 permissions: contents: read diff --git a/build.sh b/build.sh index f146357..11912f2 100755 --- a/build.sh +++ b/build.sh @@ -24,6 +24,35 @@ ADDPKGS=( ## Add gregw/extras COPR curl -so /etc/yum.repos.d/gregw-extras-fedora-40.repo https://copr.fedorainfracloud.org/coprs/gregw/extras/repo/fedora-40/gregw-extras-fedora-40.repo +## Add systemd timers for periodic ZFS scrubs +cat << EOF > /usr/lib/systemd/zfs-scrub@.service +[Unit] +Description=zpool scrub on %i + +[Service] +Nice=19 +IOSchedulingClass=idle +KillSignal=SIGINT +ExecStart=/usr/sbin/zpool scrub %i + +[Install] +WantedBy=multi-user.target +EOF + +cat << EOF > /usr/lib//systemd/system/zfs-scrub@.timer +[Unit] +Description=Weekly zpool scrub on %i + +[Timer] +OnCalendar=Mon *-*-* 04:00:00 +AccuracySec=1h +Persistent=true + +[Install] +WantedBy=multi-user.target +EOF + + RMSTRING="" ADDSTRING=""