Merge pull request #2492 from DaanDeMeyer/timeout

Extend timeout of systemd-machine-id-commit.service to 90s
systemd · Mar 13, 2024 · 4f9f22f · 4f9f22f
2 parents 1445b38 + a4cb6dd
commit 4f9f22f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,10 +15,6 @@
 /mkosi.egg-info
 /mkosi.cache
 /mkosi.output
-/mkosi.extra
-!mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
-!mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service
-!mkosi.extra/usr/lib/systemd/system-preset/*-mkosi.preset
 /mkosi.nspawn
 /mkosi.rootpw
 mkosi.local.conf

diff --git a/mkosi.extra/usr/lib/systemd/system/systemd-machine-id-commit.service.d/timeout.conf b/mkosi.extra/usr/lib/systemd/system/systemd-machine-id-commit.service.d/timeout.conf
@@ -0,0 +1,2 @@
+[Service]
+TimeoutSec=90s