Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename various [Runtime] options and rename mkosi qemu to mkosi vm #3305

Merged
merged 1 commit into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:
Environment=SYSTEMD_REPART_MKFS_OPTIONS_EROFS="--quiet"
[Runtime]
QemuKvm=yes
KVM=yes
EOF
# TODO: Remove once all distros have recent enough systemd that knows systemd.default_device_timeout_sec.
Expand Down
2 changes: 1 addition & 1 deletion docs/distribution-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ used:
another existing distribution, update the `[Match]` blocks for the
existing distribution to also match against the new distribution. To
test whether all necessary changes were made, you can run
`mkosi -d <distribution> --tools-tree -t disk -f qemu`.
`mkosi -d <distribution> --tools-tree -t disk -f vm`.
2 changes: 1 addition & 1 deletion mkosi.conf
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ KernelModulesInitrdExclude=.*
KernelModulesInitrdInclude=default

[Runtime]
QemuMem=4G
RAM=4G
2 changes: 1 addition & 1 deletion mkosi.conf.d/15-memory.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Format=|uki
Format=|cpio

[Runtime]
QemuMem=8G
RAM=8G
3 changes: 2 additions & 1 deletion mkosi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2623,7 +2623,7 @@ def check_tools(config: Config, verb: Verb) -> None:
if verb == Verb.boot:
check_systemd_tool(config, "systemd-nspawn", version="254", reason="boot images")

if verb == Verb.qemu and config.vmm == Vmm.vmspawn:
if verb in (Verb.vm, Verb.qemu) and config.vmm == Vmm.vmspawn:
check_systemd_tool(config, "systemd-vmspawn", version="256", reason="boot images with vmspawn")

if verb == Verb.sysupdate:
Expand Down Expand Up @@ -4809,6 +4809,7 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
{
Verb.shell: run_shell,
Verb.boot: run_shell,
Verb.vm: run_vm,
Verb.qemu: run_vm,
Verb.serve: run_serve,
Verb.burn: run_burn,
Expand Down
Loading
Loading