From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 29 Apr 2024 08:47:25 +0000 (+0200)
Subject: mkosi: Use systemd.crash_action=poweroff in integration tests
X-Git-Tag: v256-rc2~139^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27f166c52369e994524a6f79cf157e92e45c0433;p=thirdparty%2Fsystemd.git

mkosi: Use systemd.crash_action=poweroff in integration tests

Some integration tests expect to be able to reboot so switch to using
the new systemd.crash_action=poweroff instead.
---

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index bb19a6d10d8..0d3e4abde7b 100755
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -93,8 +93,6 @@ def main():
                 f"systemd.extra-unit.emergency-exit.service={shlex.quote(EMERGENCY_EXIT_SERVICE)}",
                 '--credential',
                 f"systemd.unit-dropin.emergency.target={shlex.quote(EMERGENCY_EXIT_DROPIN)}",
-                # Custom firmware variables allow bypassing the EFI auto-enrollment reboot so we only reboot on crash
-                '--qemu-firmware-variables=custom',
             ]
             if not sys.stderr.isatty()
             else []
@@ -115,7 +113,7 @@ def main():
                     "systemd.mask=serial-getty@.service",
                     "systemd.show_status=no",
                     "systemd.crash_shell=0",
-                    "systemd.crash_reboot",
+                    "systemd.crash_action=poweroff",
                 ]
                 if not sys.stderr.isatty()
                 else []
@@ -124,7 +122,6 @@ def main():
         '--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else 'runtime'}" ,
         *args.mkosi_args,
         'qemu',
-        *(['-no-reboot'] if not sys.stderr.isatty() else [])
     ]
 
     result = subprocess.run(cmd)