diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-04-29 10:47:25 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-04-30 17:01:41 +0200 |
| commit | 27f166c52369e994524a6f79cf157e92e45c0433 (patch) | |
| tree | ae8533a44dd24a8750f9d9f09c9efc68a488b2ef /test/integration-test-wrapper.py | |
| parent | mkosi: Add curl package for journal tests (diff) | |
| download | systemd-27f166c52369e994524a6f79cf157e92e45c0433.tar.xz systemd-27f166c52369e994524a6f79cf157e92e45c0433.zip | |
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.
Diffstat (limited to 'test/integration-test-wrapper.py')
| -rwxr-xr-x | test/integration-test-wrapper.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py index bb19a6d10d..0d3e4abde7 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) |