From 0ff76eb35a8e01f9d168dae603fa0101f5d44f76 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Sat, 12 Aug 2023 20:00:16 +0200 Subject: [PATCH 1/4] Create rpm-ostreed-automatic.service instead --- .../lib/systemd/system/rpm-ostreed-automatic.service | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 files/usr/lib/systemd/system/rpm-ostreed-automatic.service diff --git a/files/usr/lib/systemd/system/rpm-ostreed-automatic.service b/files/usr/lib/systemd/system/rpm-ostreed-automatic.service new file mode 100644 index 00000000..9ce9f854 --- /dev/null +++ b/files/usr/lib/systemd/system/rpm-ostreed-automatic.service @@ -0,0 +1,10 @@ +[Unit] +Description=rpm-ostree Automatic Update +Documentation=man:rpm-ostree(1) man:rpm-ostreed.conf(5) +ConditionPathExists=/run/ostree-booted +Wants=network-online.target +After=network-online.target + +[Service] +Type=simple +ExecStart=rpm-ostree upgrade --quiet --trigger-automatic-update-policy From 8a5d6bf009d9856775bc369dbd9197c3b2698374 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Sat, 12 Aug 2023 22:01:45 +0200 Subject: [PATCH 2/4] Delete rpm-ostreed-automatic.service --- .../lib/systemd/system/rpm-ostreed-automatic.service | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 files/usr/lib/systemd/system/rpm-ostreed-automatic.service diff --git a/files/usr/lib/systemd/system/rpm-ostreed-automatic.service b/files/usr/lib/systemd/system/rpm-ostreed-automatic.service deleted file mode 100644 index 9ce9f854..00000000 --- a/files/usr/lib/systemd/system/rpm-ostreed-automatic.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=rpm-ostree Automatic Update -Documentation=man:rpm-ostree(1) man:rpm-ostreed.conf(5) -ConditionPathExists=/run/ostree-booted -Wants=network-online.target -After=network-online.target - -[Service] -Type=simple -ExecStart=rpm-ostree upgrade --quiet --trigger-automatic-update-policy From 61de082978615ac1c2b7fee36901fbcf28073e7b Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Sat, 12 Aug 2023 23:12:32 +0200 Subject: [PATCH 3/4] Create override.conf for rpm-ostreed-automatic.service --- .../system/rpm-ostreed-automatic.service.d/override.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 files/usr/etc/systemd/system/rpm-ostreed-automatic.service.d/override.conf diff --git a/files/usr/etc/systemd/system/rpm-ostreed-automatic.service.d/override.conf b/files/usr/etc/systemd/system/rpm-ostreed-automatic.service.d/override.conf new file mode 100644 index 00000000..0a38143e --- /dev/null +++ b/files/usr/etc/systemd/system/rpm-ostreed-automatic.service.d/override.conf @@ -0,0 +1,3 @@ +[Unit] +Wants=network-online.target +After=network-online.target From 25db15c5c055249b859598925a3168ec0bb37834 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Sat, 12 Aug 2023 23:16:33 +0200 Subject: [PATCH 4/4] Update ublue-os-update-services.spec --- rpmspec/ublue-os-update-services.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rpmspec/ublue-os-update-services.spec b/rpmspec/ublue-os-update-services.spec index 8079715b..c915659c 100644 --- a/rpmspec/ublue-os-update-services.spec +++ b/rpmspec/ublue-os-update-services.spec @@ -1,7 +1,7 @@ Name: ublue-os-update-services Packager: ublue-os Vendor: ublue-os -Version: 0.6 +Version: 0.7 Release: 1%{?dist} Summary: Automatic updates for rpm-ostree and flatpak License: MIT @@ -51,6 +51,7 @@ tar xf %{SOURCE0} -C %{buildroot} --strip-components=2 --exclude etc/rpm-ostreed %attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_exec_prefix}/lib/systemd/user/flatpak-user-update.service %attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_exec_prefix}/lib/systemd/user/flatpak-user-update.timer %attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_exec_prefix}/%{_sysconfdir}/systemd/system/rpm-ostreed-automatic.timer.d/override.conf +%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_exec_prefix}/%{_sysconfdir}/systemd/system/rpm-ostreed-automatic.service.d/override.conf %attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/rpm-ostreed.conf %attr(0644,root,root) %{_exec_prefix}/lib/systemd/system-preset/10-flatpak-system-update.preset %attr(0644,root,root) %{_exec_prefix}/lib/systemd/system/flatpak-system-update.service @@ -59,9 +60,14 @@ tar xf %{SOURCE0} -C %{buildroot} --strip-components=2 --exclude etc/rpm-ostreed %attr(0644,root,root) %{_exec_prefix}/lib/systemd/user/flatpak-user-update.service %attr(0644,root,root) %{_exec_prefix}/lib/systemd/user/flatpak-user-update.timer %attr(0644,root,root) %{_exec_prefix}/%{_sysconfdir}/systemd/system/rpm-ostreed-automatic.timer.d/override.conf +%attr(0644,root,root) %{_exec_prefix}/%{_sysconfdir}/systemd/system/rpm-ostreed-automatic.service.d/override.conf + %changelog +* Sat Aug 12 2023 Fifty Dinar - 0.7 +- Switch to drop-in override for rpm-ostreed-automatic.service modifications + * Sat Aug 12 2023 Benjamin Sherman - 0.6 - Switch to drop-in override for rpm-ostreed-automatic.timer modifications