From 418beec084175aeda7e7999892f08776e6d80f60 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Fri, 17 May 2024 16:39:04 +0100
Subject: [PATCH 1/4] Run with lower nice and ionice priorities.

---
 do-backup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/do-backup b/do-backup
index dd3f0d4..0a8e35f 100755
--- a/do-backup
+++ b/do-backup
@@ -130,7 +130,7 @@ mountpoint "$BACKUP_MOUNTPOINT/" >/dev/null 2>&1 || {
 }
 
 # Do the backup.
-rsync "${RSYNC_OPTIONS[@]}" "${RSYNC_OPTIONS_VERBOSE[@]}" "${RSYNC_FILTER[@]}" "$RSYNC_SOURCE" "$BACKUP_DESTDIR" >"$RSYNC_LOG" 2>&1
+ionice -c Idle nice -n 19 rsync "${RSYNC_OPTIONS[@]}" "${RSYNC_OPTIONS_VERBOSE[@]}" "${RSYNC_FILTER[@]}" "$RSYNC_SOURCE" "$BACKUP_DESTDIR" >"$RSYNC_LOG" 2>&1
 ERR="$?"
 
 # Send a notification and mail a log if there were errors.

From 9e9950bf8aac53bcef9262acae6505070fbb7a51 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Wed, 10 Sep 2025 19:45:02 +0100
Subject: [PATCH 2/4] Delay dehydrated cron run for 15 hours + random time.

---
 cronjob-dehydrated | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cronjob-dehydrated b/cronjob-dehydrated
index 92b623f..ec31e99 100755
--- a/cronjob-dehydrated
+++ b/cronjob-dehydrated
@@ -1,3 +1,6 @@
 #!/bin/bash
 
+# Delay the run for 15 hours (from midnight) and then run at a random time within 3 hours after that.
+sleep $(( 54000 + (RANDOM % 10800) ))
+
 /usr/sbin/dehydrated -c >/dev/null

From 7f7a0a110a6549302eba373d69057810ec9d440a Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Wed, 10 Sep 2025 19:46:43 +0100
Subject: [PATCH 3/4] Add pkglist support for Alpine Linux.

---
 cronjob-update-packages-list | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cronjob-update-packages-list b/cronjob-update-packages-list
index 989cc4e..e41ee40 100755
--- a/cronjob-update-packages-list
+++ b/cronjob-update-packages-list
@@ -11,6 +11,9 @@
 
 # Create package list depending on system type.
 case "$ID" in
+  'alpine')
+    /sbin/apk list -I | cut -d' ' -f1 | rev | cut -d- -f3- | rev >/etc/pkglist
+    ;;
   'debian'|'ubuntu')
     /usr/bin/dpkg-query --show --showformat='${Package}\n' >/etc/pkglist
     ;;

From 3e51c233407ced532bc053694f38258d4fd57a3e Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Wed, 10 Sep 2025 20:00:22 +0100
Subject: [PATCH 4/4] Fix merge.

---
 cronjob-update-packages-list | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cronjob-update-packages-list b/cronjob-update-packages-list
index e41ee40..824965d 100755
--- a/cronjob-update-packages-list
+++ b/cronjob-update-packages-list
@@ -12,17 +12,18 @@
 # Create package list depending on system type.
 case "$ID" in
   'alpine')
-    /sbin/apk list -I | cut -d' ' -f1 | rev | cut -d- -f3- | rev >/etc/pkglist
+    apk list -I | cut -d' ' -f1 | rev | cut -d- -f3- | rev >/etc/pkglist
     ;;
   'debian'|'ubuntu')
-    /usr/bin/dpkg-query --show --showformat='${Package}\n' >/etc/pkglist
+    dpkg-query --show --showformat='${Package}\n' >/etc/pkglist
     ;;
   'slackware')
-    /usr/sbin/slackpkg -batch=on -default_answer=y generate-template "$(hostname --short)" >/dev/null
-    [[ ! -e /etc/pkglist ]] && ln -sf "/etc/slackpkg/templates/$(hostname --short).template" /etc/pkglist
+    slackpkg -batch=on -default_answer=y generate-template "$(hostname --short)" >/dev/null
+    [[ -L /etc/pkglist ]] && rm -f /etc/pkglist
+    ls -1 /var/log/packages/ | rev | cut -d- -f4- | rev >/etc/pkglist
     ;;
   'void')
-    /usr/sbin/xbps-query -l | awk '{ print $2 }' | rev | cut -d- -f2- | rev >/etc/pkglist
+    xbps-query -l | awk '{ print $2 }' | rev | cut -d- -f2- | rev >/etc/pkglist
     ;;
   *)
     printf "%s: %s\\n" "${BASH_SOURCE[0]}" "Unsupported system." >&2