mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-04 15:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

mkosi: Use systemd.crash_action=poweroff in integration tests

Browse Source 
Some integration tests expect to be able to reboot so switch to using
the new systemd.crash_action=poweroff instead.
This commit is contained in:
Daan De Meyer 2024-04-29 10:47:25 +02:00
parent 334e707329
commit 27f166c523
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration-test-wrapper.py
View File

@ -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)