[rpms/fedora-release] f45: Keep upstream default shutdown timeout for some variants

[rpms/fedora-release] f45: Keep upstream default shutdown timeout for some variants

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

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 26ee8abfdcf40f77c7fd7a28ba627abe9b9d9718
            Author : Timothée Ravier <tim@siosm.fr>
            Date   : 2023-02-16T12:12:30+01:00
            Stats  : +10/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/26ee8abfdcf40f77c7fd7a28ba627abe9b9d9718?branch=f45

            Log:
            Keep upstream default shutdown timeout for some variants

Reset the default timeout to systemd upstream defaults for the following
Fedora editions/variants:
 - Fedora CoreOS

See:
- Fedora Change: https://fedoraproject.org/wiki/Changes/Shorter_Shutdown_Timer
- Upstream systemd change: https://github.com/systemd/systemd/pull/26242
- Fedora systemd change: https://src.fedoraproject.org/rpms/systemd/c/ba02e904964116b848080ca72243174f4ef3eced?branch=rawhide
- Discussion for Fedora CoreOS: https://github.com/coreos/fedora-coreos-tracker/issues/1404

---
diff --git a/default-timeout.conf b/default-timeout.conf
new file mode 100644
index 0000000..898f975
--- /dev/null
+++ b/default-timeout.conf
@@ -0,0 +1,5 @@
+# Reset the default timeout to systemd upstream defaults
+# See: https://fedoraproject.org/wiki/Changes/Shorter_Shutdown_Timer
+DefaultTimeoutStartSec=90s
+DefaultTimeoutStopSec=90s
+DefaultDeviceTimeoutSec=90s

diff --git a/fedora-release.spec b/fedora-release.spec
index b139083..2b3c3c2 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -106,6 +106,7 @@ Source24:       80-iot-user.preset
 Source25:       plasma-desktop.conf
 Source26:       80-kde.preset
 Source27:       81-desktop.preset
+Source28:       default-timeout.conf
 
 BuildArch:      noarch
 
@@ -1190,6 +1191,8 @@ sed -i -e 's|PRETTY_NAME=.*|PRETTY_NAME="Fedora CoreOS %{dist_version}"|' %{buil
 sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/CoreOS/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.coreos
 sed -i -e "/^DEFAULT_HOSTNAME=/d" %{buildroot}%{_prefix}/lib/os-release.coreos
 install -Dm0644 %{SOURCE22} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
+install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
 %endif
 
 
@@ -1522,6 +1525,8 @@ ln -s --relative %{buildroot}%{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swid
 %files coreos
 %files identity-coreos
 %{_prefix}/lib/systemd/system-preset/80-coreos.preset
+%{_prefix}/lib/systemd/system.conf.d/default-timeout.conf
+%{_prefix}/lib/systemd/user.conf.d/default-timeout.conf
 %{_prefix}/lib/os-release.coreos
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.coreos
 %endif