mirror of
https://github.com/systemd/systemd.git
synced 2025-01-31 05:47:30 +03:00
mkosi: Migrate more deprecated options
(cherry picked from commit 28baef47a3098bd82b27c0a629df6c5f885693e7)
This commit is contained in:
parent
a1f6747606
commit
d9bf9ede93
2
.github/workflows/coverage.yml
vendored
2
.github/workflows/coverage.yml
vendored
@ -64,7 +64,7 @@ jobs:
|
||||
COVERAGE=1
|
||||
|
||||
[Runtime]
|
||||
QemuMem=4G
|
||||
RAM=4G
|
||||
EOF
|
||||
|
||||
- name: Generate secure boot key
|
||||
|
2
.github/workflows/mkosi.yml
vendored
2
.github/workflows/mkosi.yml
vendored
@ -171,7 +171,7 @@ jobs:
|
||||
SELinuxRelabel=${{ matrix.relabel }}
|
||||
|
||||
[Runtime]
|
||||
QemuMem=4G
|
||||
RAM=4G
|
||||
EOF
|
||||
|
||||
- name: Generate secure boot key
|
||||
|
@ -479,9 +479,8 @@ def main() -> None:
|
||||
'--runtime-network=none',
|
||||
'--runtime-scratch=no',
|
||||
*args.mkosi_args,
|
||||
'--qemu-firmware',
|
||||
args.firmware,
|
||||
*(['--qemu-kvm', 'no'] if int(os.getenv('TEST_NO_KVM', '0')) else []),
|
||||
'--firmware', args.firmware,
|
||||
*(['--kvm', 'no'] if int(os.getenv('TEST_NO_KVM', '0')) else []),
|
||||
'--kernel-command-line-extra',
|
||||
' '.join(
|
||||
[
|
||||
@ -504,7 +503,7 @@ def main() -> None:
|
||||
),
|
||||
'--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}",
|
||||
*(['--runtime-build-sources=no'] if not sys.stderr.isatty() else []),
|
||||
'qemu' if args.vm or os.getuid() != 0 or os.getenv('TEST_PREFER_QEMU', '0') == '1' else 'boot',
|
||||
'vm' if args.vm or os.getuid() != 0 or os.getenv('TEST_PREFER_QEMU', '0') == '1' else 'boot',
|
||||
] # fmt: skip
|
||||
|
||||
result = subprocess.run(cmd)
|
||||
|
Loading…
x
Reference in New Issue
Block a user