shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-24 17:57:34 +03:00
Code

mkosi: Migrate more deprecated options

Browse Source 
(cherry picked from commit 28baef47a3098bd82b27c0a629df6c5f885693e7)
This commit is contained in:
Daan De Meyer 2025-01-06 12:07:53 +01:00 committed by Luca Boccassi
parent a1f6747606
commit d9bf9ede93
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/coverage.yml vendored
View File

@ -64,7 +64,7 @@ jobs:
COVERAGE=1 COVERAGE=1
[Runtime] [Runtime]
QemuMem=4G RAM=4G
EOF EOF
- name: Generate secure boot key - name: Generate secure boot key

2
.github/workflows/mkosi.yml vendored
View File

@ -171,7 +171,7 @@ jobs:
SELinuxRelabel=${{ matrix.relabel }} SELinuxRelabel=${{ matrix.relabel }}
[Runtime] [Runtime]
QemuMem=4G RAM=4G
EOF EOF
- name: Generate secure boot key - name: Generate secure boot key

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

@ -479,9 +479,8 @@ def main() -> None:
'--runtime-network=none', '--runtime-network=none',
'--runtime-scratch=no', '--runtime-scratch=no',
*args.mkosi_args, *args.mkosi_args,
'--qemu-firmware', '--firmware', args.firmware,
args.firmware, *(['--kvm', 'no'] if int(os.getenv('TEST_NO_KVM', '0')) else []),
*(['--qemu-kvm', 'no'] if int(os.getenv('TEST_NO_KVM', '0')) else []),
'--kernel-command-line-extra', '--kernel-command-line-extra',
' '.join( ' '.join(
[ [
@ -504,7 +503,7 @@ def main() -> None:
), ),
'--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}", '--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}",
*(['--runtime-build-sources=no'] if not sys.stderr.isatty() else []), *(['--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 ] # fmt: skip
result = subprocess.run(cmd) result = subprocess.run(cmd)