From: Luca Boccassi <bluca@debian.org>
Date: Wed, 26 Jul 2023 11:36:40 +0000 (+0100)
Subject: mkosi: add drop-in to make emergency.service shut down the system
X-Git-Tag: v254~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cf5b343c927509ea91cf56ca88e330f193a6963;p=thirdparty%2Fsystemd.git

mkosi: add drop-in to make emergency.service shut down the system

When the mkosi CI fails to boot, it just sits there waiting at the emergency
console until the job times out. Add a drop-in for emergency.service in the
CI configuration so that instead it exists immediately.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 2a0f7a90965..2ab8423a60e 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -112,6 +112,20 @@ jobs:
         Format=squashfs
         EOF
 
+        # The emergency shell is not useful in the CI, as it just blocks for a long time before the job
+        # eventually times out. Override it to just shutdown immediately.
+        mkdir -p mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
+        mkdir -p mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
+        tee mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf <<- EOF
+        [Unit]
+        FailureAction=exit
+        [Service]
+        ExecStartPre=
+        ExecStart=
+        ExecStart=false
+        EOF
+        cp mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf
+
     - name: Generate secure boot key
       run: mkosi --debug genkey