From cf132260df1412ddadfb622b6d423e30b11f5461 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Sat, 14 Jun 2025 12:48:35 -0400 Subject: [PATCH] Attempt to utilize bling module ublue-update instead of personal systemd units. --- files/system/etc/ublue-update/ublue-update.toml | 8 ++++++++ files/systemd/system/bootc-fetch-updates.service | 8 -------- files/systemd/system/bootc-fetch-updates.timer | 12 ------------ .../systemd/system/flag-update-downloaded.service | 10 ---------- files/systemd/system/flatpak-system-update.service | 5 ----- files/systemd/system/flatpak-system-update.timer | 9 --------- files/systemd/user/bootc-status-updated.path | 10 ---------- files/systemd/user/bootc-status-updated.target | 4 ---- files/systemd/user/flatpak-user-update.service | 5 ----- files/systemd/user/flatpak-user-update.timer | 9 --------- files/systemd/user/notify-update.service | 11 ----------- recipes/components/base-module.yml | 14 ++++---------- 12 files changed, 12 insertions(+), 93 deletions(-) create mode 100644 files/system/etc/ublue-update/ublue-update.toml delete mode 100644 files/systemd/system/bootc-fetch-updates.service delete mode 100644 files/systemd/system/bootc-fetch-updates.timer delete mode 100644 files/systemd/system/flag-update-downloaded.service delete mode 100644 files/systemd/system/flatpak-system-update.service delete mode 100644 files/systemd/system/flatpak-system-update.timer delete mode 100644 files/systemd/user/bootc-status-updated.path delete mode 100644 files/systemd/user/bootc-status-updated.target delete mode 100644 files/systemd/user/flatpak-user-update.service delete mode 100644 files/systemd/user/flatpak-user-update.timer delete mode 100644 files/systemd/user/notify-update.service diff --git a/files/system/etc/ublue-update/ublue-update.toml b/files/system/etc/ublue-update/ublue-update.toml new file mode 100644 index 0000000..c4ac766 --- /dev/null +++ b/files/system/etc/ublue-update/ublue-update.toml @@ -0,0 +1,8 @@ +[checks] + min_battery_percent = 20.0 + max_cpu_load_percent = 50.0 + max_mem_percent = 90.0 + network_not_metered = true + +[notify] + dbus_notify = true \ No newline at end of file diff --git a/files/systemd/system/bootc-fetch-updates.service b/files/systemd/system/bootc-fetch-updates.service deleted file mode 100644 index c316cde..0000000 --- a/files/systemd/system/bootc-fetch-updates.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Download bootc updates -Documentation=man:bootc(8) -ConditionPathExists=/run/ostree-booted - -[Service] -Type=oneshot -ExecStart=/usr/bin/bootc update --quiet \ No newline at end of file diff --git a/files/systemd/system/bootc-fetch-updates.timer b/files/systemd/system/bootc-fetch-updates.timer deleted file mode 100644 index 482831f..0000000 --- a/files/systemd/system/bootc-fetch-updates.timer +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Download bootc updates -Documentation=man:bootc(8) -ConditionPathExists=/run/ostree-booted - -[Timer] -OnBootSec=15min -OnUnitInactiveSec=8h -RandomizedDelaySec=2h - -[Install] -WantedBy=timers.target \ No newline at end of file diff --git a/files/systemd/system/flag-update-downloaded.service b/files/systemd/system/flag-update-downloaded.service deleted file mode 100644 index dde8c29..0000000 --- a/files/systemd/system/flag-update-downloaded.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Create a file to flag that an update has been downloaded -After=bootc-status-updated.target - -[Service] -Type=exec -ExecStart=/usr/bin/touch /tmp/hydro-os-updated - -[Install] -WantedBy=bootc-status-updated.target \ No newline at end of file diff --git a/files/systemd/system/flatpak-system-update.service b/files/systemd/system/flatpak-system-update.service deleted file mode 100644 index ca8f96c..0000000 --- a/files/systemd/system/flatpak-system-update.service +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Update flatpaks - -[Service] -ExecStart=flatpak update --noninteractive \ No newline at end of file diff --git a/files/systemd/system/flatpak-system-update.timer b/files/systemd/system/flatpak-system-update.timer deleted file mode 100644 index ff66905..0000000 --- a/files/systemd/system/flatpak-system-update.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Update flatpak - -[Timer] -OnBootSec=15min -OnCalendar=daily - -[Install] -WantedBy=timers.target \ No newline at end of file diff --git a/files/systemd/user/bootc-status-updated.path b/files/systemd/user/bootc-status-updated.path deleted file mode 100644 index f38a4d0..0000000 --- a/files/systemd/user/bootc-status-updated.path +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Monitor bootc for status changes -Documentation=man:bootc-status-updated.path(5) - -[Path] -PathExists=/tmp/hydro-os-updated -Unit=bootc-status-updated.target - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/files/systemd/user/bootc-status-updated.target b/files/systemd/user/bootc-status-updated.target deleted file mode 100644 index c74140d..0000000 --- a/files/systemd/user/bootc-status-updated.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Target for bootc status changes -Documentation=man:bootc-status-updated.target(5) -StopWhenUnneeded=true \ No newline at end of file diff --git a/files/systemd/user/flatpak-user-update.service b/files/systemd/user/flatpak-user-update.service deleted file mode 100644 index ca8f96c..0000000 --- a/files/systemd/user/flatpak-user-update.service +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Update flatpaks - -[Service] -ExecStart=flatpak update --noninteractive \ No newline at end of file diff --git a/files/systemd/user/flatpak-user-update.timer b/files/systemd/user/flatpak-user-update.timer deleted file mode 100644 index ff66905..0000000 --- a/files/systemd/user/flatpak-user-update.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Update flatpak - -[Timer] -OnBootSec=15min -OnCalendar=daily - -[Install] -WantedBy=timers.target \ No newline at end of file diff --git a/files/systemd/user/notify-update.service b/files/systemd/user/notify-update.service deleted file mode 100644 index 0a94150..0000000 --- a/files/systemd/user/notify-update.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Notify the user when the next update has been downloaded. -# order after update has been applied -After=bootc-status-updated.target - -[Service] -Type=exec -ExecStart=/usr/bin/systemd-run --user notify-send 'Update Downloaded!' 'A new update has been downloaded! Please restart to apply update!' - -[Install] -WantedBy=bootc-status-updated.target \ No newline at end of file diff --git a/recipes/components/base-module.yml b/recipes/components/base-module.yml index 4791703..45b9e26 100644 --- a/recipes/components/base-module.yml +++ b/recipes/components/base-module.yml @@ -13,20 +13,14 @@ modules: - addimageinfo.sh - type: systemd - system: - enabled: - - bootc-fetch-updates.timer - - podman-auto-update.timer - - flatpak-system-update.timer - - flag-update-downloaded.service user: enabled: - - podman-auto-update.timer - - flatpak-user-update.timer - unlock-kwallet.service - - notify-update.service - - bootc-status-updated.path + - type: bling + install: + - ublue-update + - type: dnf install: packages: