From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 13 Mar 2024 09:26:52 +0000 (+0100)
Subject: units: Bump various oneshot unit timeouts to 90s
X-Git-Tag: v256-rc1~546
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffc2773804761d42287c30842009ad98113bae69;p=thirdparty%2Fsystemd.git

units: Bump various oneshot unit timeouts to 90s

In mkosi, we've been having CI failures caused by
systemd-machine-id-commit.service timing out. Let's bump the timeout
for it and systemd-rfkill.service to 90s which we also use for other
oneshot services to avoid transient failures on slower systems.
---

diff --git a/units/systemd-machine-id-commit.service b/units/systemd-machine-id-commit.service
index 89e0613955c..0ad6cf3ab01 100644
--- a/units/systemd-machine-id-commit.service
+++ b/units/systemd-machine-id-commit.service
@@ -21,4 +21,4 @@ ConditionPathIsMountPoint=/etc/machine-id
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=systemd-machine-id-setup --commit
-TimeoutSec=30s
+TimeoutSec=90s
diff --git a/units/systemd-rfkill.service.in b/units/systemd-rfkill.service.in
index c6b32a18ea5..072ae643b08 100644
--- a/units/systemd-rfkill.service.in
+++ b/units/systemd-rfkill.service.in
@@ -22,5 +22,5 @@ Before=shutdown.target
 ExecStart={{LIBEXECDIR}}/systemd-rfkill
 NoNewPrivileges=yes
 StateDirectory=systemd/rfkill
-TimeoutSec=30s
+TimeoutSec=90s
 Type=notify