[rpms/fedora-release] f45: make recent shutdown timeout conf filename more appropriate

[rpms/fedora-release] f45: make recent shutdown timeout conf filename more appropriate

[Dusty Mabe]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 1dbac75e84939949fe5bdc689a8b16c66c585d91
            Author : Dusty Mabe <dusty@dustymabe.com>
            Date   : 2023-03-01T15:25:25-05:00
            Stats  : +8/-8 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/1dbac75e84939949fe5bdc689a8b16c66c585d91?branch=f45

            Log:
            make recent shutdown timeout conf filename more appropriate

The previous name of default-timeout.conf sounds like it's setting
the default for Fedora, but it's not. It's actually overriding the
default timeout for the variants that prefer the longer timeout
The new name might help give more clues.

---
diff --git a/default-timeout.conf b/default-timeout.conf
deleted file mode 100644
index 898f975..0000000
--- a/default-timeout.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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 2b3c3c2..c17a28e 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -106,7 +106,7 @@ Source24:       80-iot-user.preset
 Source25:       plasma-desktop.conf
 Source26:       80-kde.preset
 Source27:       81-desktop.preset
-Source28:       default-timeout.conf
+Source28:       longer-default-shutdown-timeout.conf
 
 BuildArch:      noarch
 
@@ -1525,8 +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/systemd/system.conf.d/longer-default-shutdown-timeout.conf
+%{_prefix}/lib/systemd/user.conf.d/longer-default-shutdown-timeout.conf
 %{_prefix}/lib/os-release.coreos
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.coreos
 %endif

diff --git a/longer-default-shutdown-timeout.conf b/longer-default-shutdown-timeout.conf
new file mode 100644
index 0000000..898f975
--- /dev/null
+++ b/longer-default-shutdown-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