diff --git a/.gitignore b/.gitignore index 3eb5812..c2947e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ mkosi.output/ mkosi.key -test.qcow2 -vars.fd diff --git a/README.md b/README.md index 7b1a6ad..0be543b 100644 --- a/README.md +++ b/README.md @@ -27,16 +27,10 @@ mkosi genkey # local test only, CI uses the SECUREBOOT_KEY secret mkosi build ``` -`mkosi.output/` then holds the disk image (`agent_.raw`) and the UKI and root partitions that make up an update. To boot it with Secure Boot (needs `qemu-kvm-core edk2-ovmf`): +`mkosi.output/` then holds the disk image (`agent_.raw`) and the UKI and root partitions that make up an update. To build and boot a test VM with Secure Boot (needs `qemu-kvm-core edk2-ovmf`): ```sh -qemu-img create -f qcow2 -F raw -b $PWD/mkosi.output/agent_.raw test.qcow2 40G -cp /usr/share/edk2/ovmf/OVMF_VARS.fd vars.fd -qemu-kvm -m 8G -cpu host -nographic -nic user,model=virtio-net-pci,hostfwd=tcp::2222-:22 -drive file=test.qcow2,if=virtio \ - -machine q35,smm=on -global driver=cfi.pflash01,property=secure,value=on \ - -drive if=pflash,format=raw,readonly=on,file=/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd -drive if=pflash,format=raw,file=vars.fd \ - -smbios type=11,value=io.systemd.credential:agent.password=test \ - -smbios type=11,value=io.systemd.credential.binary:agent.ssh-key=$(base64 -w0 ~/.ssh/id_ed25519.pub) +mkosi -f vm ``` -The credentials answer the setup, so it boots straight to a login (root, password `test`) on the serial console. Ctrl-a x quits. Then `ssh -p 2222 claude@localhost`. +The `[Runtime]` section of `mkosi.conf` answers the setup, so it boots straight to a login (root, password `test`). Then `ssh -p 2222 claude@localhost` with your own key (`mkosi.credentials/agent.ssh-key`). diff --git a/mkosi.conf b/mkosi.conf index d8752ec..4aad31d 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -138,3 +138,17 @@ RemoveFiles= SecureBoot=yes SecureBootKey=mkosi.key SecureBootCertificate=mkosi.crt + +[Runtime] +# For testing with mkosi vm. It does the setup itself (the agent.* credentials, +# mkosi.extra/usr/libexec/agent-setup). Its console is hvc0, which the UKI +# doesn't use: with Secure Boot, systemd-stub ignores the console= mkosi +# passes. So the serial port joins that console, and replaces mkosi's network +# to forward ssh to port 2222. Ephemeral boots a copy, so test runs don't +# change the built image. +Ephemeral=yes +RAM=8G +RuntimeSize=40G +RuntimeNetwork=none +QemuArgs=-serial chardev:console -nic user,model=virtio-net-pci,hostfwd=tcp::2222-:22 +Credentials=agent.password=test agent.hostname=agent-test mkosi.credentials/ diff --git a/mkosi.credentials/agent.ssh-key b/mkosi.credentials/agent.ssh-key new file mode 100755 index 0000000..0946e36 --- /dev/null +++ b/mkosi.credentials/agent.ssh-key @@ -0,0 +1,6 @@ +#!/bin/sh +# SSH key for mkosi vm +# +# mkosi vm runs this and passes what it prints as the credential agent.ssh-key +# (mkosi.conf), so you can ssh into the test VM with your own keys. +cat ~/.ssh/*.pub 2>/dev/null || true diff --git a/mkosi.extra/usr/libexec/agent-setup b/mkosi.extra/usr/libexec/agent-setup index 5dd2013..d1f2a4f 100755 --- a/mkosi.extra/usr/libexec/agent-setup +++ b/mkosi.extra/usr/libexec/agent-setup @@ -8,8 +8,8 @@ # boot. # # With the credential agent.password, it asks nothing and takes the answers -# from the credentials agent.password, agent.hostname and agent.ssh-key, such -# as for a test VM (README.md). +# from the credentials agent.password, agent.hostname and agent.ssh-key. mkosi +# vm passes them (mkosi.conf). set -euo pipefail cred() { cat "${CREDENTIALS_DIRECTORY:-/nonexistent}/agent.$1" 2>/dev/null; }