From 6263e0a2c0b5675e4113ff8d8e36c4be8cbfcc62 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 2 Dec 2022 10:44:56 +0100 Subject: [PATCH 1/2] mkosi: Drop explicit Format= Once mkosi migrates to systemd-repart, only "disk" will be supported for making disk images with mkosi and the filesystem will have to be specified in repart partition definition files. To accomodate this change, let's remove the explicit Format= assignment which means we'll default to a disk image with ext4 until we add our own mkosi.repart/ directory. --- mkosi.conf.d/10-systemd.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf index f9e4d08616..f7b440812d 100644 --- a/mkosi.conf.d/10-systemd.conf +++ b/mkosi.conf.d/10-systemd.conf @@ -3,7 +3,6 @@ # This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi). [Output] -Format=gpt_btrfs Bootable=yes HostonlyInitrd=yes # Prevent ASAN warnings when building the image From d3a8471754f08f4c0c5d51df055cdd6770a87de2 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 2 Dec 2022 10:46:32 +0100 Subject: [PATCH 2/2] mkosi: Drop HostonlyInitrd=yes This option will be removed in the upcoming version of mkosi so let's stop using it in our config. --- mkosi.conf.d/10-systemd.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf index f7b440812d..a91378da97 100644 --- a/mkosi.conf.d/10-systemd.conf +++ b/mkosi.conf.d/10-systemd.conf @@ -4,7 +4,6 @@ [Output] Bootable=yes -HostonlyInitrd=yes # Prevent ASAN warnings when building the image Environment=ASAN_OPTIONS=verify_asan_link_order=false OutputDirectory=mkosi.output