From 96110261ee7716bf19a6920a4206365614ad3857 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 4 Jul 2024 12:13:31 +0200 Subject: [PATCH] mkosi: Build a disk image by default again Now that we have a way to rebuild and reinstall systemd without having to rebuild the image, let's default to building a disk image again. --- docs/HACKING.md | 25 ++++--------------------- mkosi.images/system/mkosi.conf | 1 - 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/docs/HACKING.md b/docs/HACKING.md index 5a00f1bfd5..5b1e355327 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -45,27 +45,10 @@ or: $ mkosi qemu ``` -Every time you rerun the `mkosi` command a fresh image is built, -incorporating all current changes you made to the project tree. - -By default a directory image is built. -This requires `virtiofsd` to be installed on the host. -To build a disk image instead which does not require `virtiofsd`, add the following to `mkosi.local.conf`: - -```conf -[Output] -Format=disk -``` - -To boot in UEFI mode instead of using QEMU's direct kernel boot, add the following to `mkosi.local.conf`: - -```conf -[Host] -QemuFirmware=uefi -``` - -To avoid having to build a new image all the time when iterating on a patch, -add the following to `mkosi.local.conf`: +Every time you rerun the `mkosi` command a fresh image is built, incorporating +all current changes you made to the project tree. To avoid having to build a new +image all the time when iterating on a patch, add the following to +`mkosi.local.conf`: ```conf [Host] diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf index d1632f19f2..f8a91df5ec 100644 --- a/mkosi.images/system/mkosi.conf +++ b/mkosi.images/system/mkosi.conf @@ -4,7 +4,6 @@ InitrdInclude=initrd/ [Output] -@Format=directory RepartDirectories=mkosi.repart [Content] -- 2.25.1