diff --git a/docs/HACKING.md b/docs/HACKING.md index 049f50f870..a062deacb8 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -51,7 +51,7 @@ To build and boot an OS image with the latest systemd installed: $ mkosi -f genkey # Generate signing keys once. $ mkosi -f sandbox meson compile -C build mkosi # (re-)build the OS image $ sudo mkosi boot # Boot the image with systemd-nspawn. -$ mkosi qemu # Boot the image with qemu. +$ mkosi vm # Boot the image with qemu. ``` Putting this all together, here's a series of commands for preparing a patch for @@ -67,7 +67,7 @@ $ $EDITOR src/core/main.c # or wherever you'd like to make $ mkosi -f sandbox meson setup build # Set up meson $ mkosi -f genkey # Generate signing keys once. $ mkosi -f sandbox meson compile -C build mkosi # (re-)build the test image -$ mkosi qemu # Boot the image in qemu +$ mkosi vm # Boot the image in qemu $ git add -p # interactively put together your patch $ git commit # commit it $ git push -u # where REMOTE is your "fork" on GitHub @@ -214,7 +214,7 @@ To simplify debugging systemd when testing changes using mkosi, we're going to s To allow VSCode's debugger to attach to systemd running in a mkosi image, we have to make sure it can access the virtual machine spawned by mkosi where systemd is running. -After booting the image with `mkosi qemu`, +After booting the image with `mkosi vm`, you should now be able to connect to it by running `mkosi ssh` from the same directory in another terminal window. Now we need to configure VSCode. diff --git a/mkosi.conf b/mkosi.conf index c5d7286b2f..559901dfff 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -141,10 +141,10 @@ Credentials= tty.console.login.noauth=yes RuntimeBuildSources=yes RuntimeScratch=no -QemuSmp=2 -QemuSwtpm=yes -QemuVsock=yes -QemuKvm=yes +CPUs=2 +TPM=yes +VSock=yes +KVM=yes [Include] Include=%D/mkosi.sanitizers