mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-12 03:33:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

mkosi: Make sure our extra kernel command line overrides the config one

Browse Source
This commit is contained in:
Daan De Meyer 2024-04-28 19:28:37 +02:00
parent a531931cd4
commit 06489e8332
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +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)}",
'--kernel-command-line-extra=systemd.mask=serial-getty@.service systemd.show_status=no systemd.crash_shell=0 systemd.crash_reboot',
# Custom firmware variables allow bypassing the EFI auto-enrollment reboot so we only reboot on crash
'--qemu-firmware-variables=custom',
]
@ -109,6 +108,16 @@ def main():
'systemd.hostname=H',
f"SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/testsuite-{args.test_number}.units:/usr/lib/systemd/tests/testdata/units:",
f"systemd.unit={test_unit}",
*(
[
"systemd.mask=serial-getty@.service",
"systemd.show_status=no",
"systemd.crash_shell=0",
"systemd.crash_reboot",
]
if not sys.stderr.isatty()
else []
),
]),
'--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else 'runtime'}" ,
*args.mkosi_args,