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 89e0613955ccce67e8f1e4c76275c7e5d2c1dcb4..0ad6cf3ab0188ec4876a371c3163b26343ac06db 100644 (file)
--- 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 c6b32a18ea5ca163827f189c10d09373e249ce39..072ae643b087964293a017898abe2ab78814e513 100644 (file)
--- 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