diff options
| author |  Christian Hesse <mail@eworm.de> | 2023-07-11 13:08:46 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2023-07-11 13:08:46 +0200 |
| commit | a8479069799046c97ef918b27d7428d6754b3fdc (patch) | |
| tree | 2a123e7a5991c487e9f175c3d2d0637a283ef385 | |
| parent | 6147875514edec881f07a79fd75e161e8d2efe60 (diff) | |
| download | pacman-offline-a8479069799046c97ef918b27d7428d6754b3fdc.tar.gz pacman-offline-a8479069799046c97ef918b27d7428d6754b3fdc.tar.zst | |
support systemd without soft-reboot
| -rwxr-xr-x | bin/pacman-offline | 6 | ||||
| -rwxr-xr-x | systemd/pacman-offline | 2 | ||||
| -rw-r--r-- | systemd/pacman-offline-reboot.service | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/bin/pacman-offline b/bin/pacman-offline index 57024f0..1a3acf9 100755 --- a/bin/pacman-offline +++ b/bin/pacman-offline @@ -78,7 +78,11 @@ ln -sf /var/cache/pacman/pkg /system-update # reboot if requested if [ ${REBOOT} -eq 1 ]; then - systemctl soft-reboot + if systemctl --dry-run soft-reboot 2>/dev/null; then + systemctl soft-reboot + else + systemctl reboot + fi # start timer if requested elif [ ${TIMER} -eq 1 ]; then systemctl start pacman-offline-reboot.timer diff --git a/systemd/pacman-offline b/systemd/pacman-offline index 48692eb..b3db182 100755 --- a/systemd/pacman-offline +++ b/systemd/pacman-offline @@ -25,7 +25,7 @@ pacman --config /run/pacman.conf --sync --noconfirm --sysupgrade pacman --sync --noconfirm --clean # reboot -if [ -s "/usr/lib/modules/$(uname -r)/pkgbase" ]; then +if [ -s "/usr/lib/modules/$(uname -r)/pkgbase" ] && systemctl --dry-run soft-reboot 2>/dev/null; then systemctl soft-reboot else systemctl reboot diff --git a/systemd/pacman-offline-reboot.service b/systemd/pacman-offline-reboot.service index 7026061..f7f3612 100644 --- a/systemd/pacman-offline-reboot.service +++ b/systemd/pacman-offline-reboot.service @@ -4,4 +4,4 @@ ConditionPathExists=/system-update [Service] Type=oneshot -ExecStart=/usr/bin/systemctl soft-reboot +ExecStart=/bin/sh -c "if systemctl --dry-run soft-reboot 2>/dev/null; then systemctl soft-reboot; else systemctl reboot; fi" |