[rpms/fedora-release] f45: Statically enable rpm-ostree-countme timer

[rpms/fedora-release] f45: Statically enable rpm-ostree-countme timer

[@ 2026-08-10 9:35 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : eb6fbdd2190811d77a0cbed0118d49ad6c75802f
            Author : Timothée Ravier <tim@siosm.fr>
            Date   : 2021-11-25T06:36:04+00:00
            Stats  : +9/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/eb6fbdd2190811d77a0cbed0118d49ad6c75802f?branch=f45

            Log:
            Statically enable rpm-ostree-countme timer

Commit 059e64f generalized the rpm-ostree count me unit activation using
the systemd preset configuration file.

This previous change incorrectly assumed that all rpm-ostree based
variants where using the presets as source of truth work enabled
services, but this is right now only true for Fedora CoreOS.

Work is in progress to update Silverblue/Kinoite and IoT to preset-all
by default. However this change will most likely be F36+ only.

Thus this change statically enables the timer unit for IoT, Silverblue &
Kinoite. Users can still opt out of counting as before by masking the
unit and this will not re-enable it for those that opted-out earlier.

See:
- https://pagure.io/workstation-ostree-config/pull-request/246
- https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/ignition-and-ostree.yaml#L39..L48
- https://github.com/coreos/fedora-coreos-config/pull/73
- https://github.com/coreos/fedora-coreos-config/pull/77
- https://github.com/coreos/fedora-coreos-config/pull/122
- https://github.com/coreos/rpm-ostree/issues/1803

Fixes: 059e64f 90-default.preset: Enable rpm-ostree count me by default

---
diff --git a/fedora-release.spec b/fedora-release.spec
index 6f9306c..f254cde 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -1123,6 +1123,12 @@ install -Dm0644 %{SOURCE16} -t %{buildroot}%{_datadir}/glib-2.0/schemas/
 install -Dm0644 %{SOURCE17} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
 %endif
 
+%if %{with iot} || %{with silverblue} || %{with kinoite}
+# Statically enable rpm-ostree-countme timer
+install -dm0755 %{buildroot}%{_unitdir}/timers.target.wants/
+ln -snf %{_unitdir}/rpm-ostree-countme.timer %{buildroot}%{_unitdir}/timers.target.wants/
+%endif
+
 %if %{with xfce}
 # Xfce
 cp -p os-release \
@@ -1284,6 +1290,7 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 %{_prefix}/lib/systemd/user-preset/80-iot-user.preset
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.iot
 %{_prefix}/lib/zezere-ignition-url
+%{_unitdir}/timers.target.wants/rpm-ostree-countme.timer
 %endif
 
 
@@ -1321,6 +1328,7 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 # Keep this in sync with workstation below
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.override
 %{_prefix}/lib/systemd/system-preset/80-workstation.preset
+%{_unitdir}/timers.target.wants/rpm-ostree-countme.timer
 %endif
 
 
@@ -1329,6 +1337,7 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 %files identity-kinoite
 %{_prefix}/lib/os-release.kinoite
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kinoite
+%{_unitdir}/timers.target.wants/rpm-ostree-countme.timer
 %endif