From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 22 Sep 2023 11:10:28 +0000 (+0200)
Subject: mkosi: Don't skip initrd dependency when building a directory image
X-Git-Tag: v255-rc1~459
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc5473b73728c4ec9ee1650818f623605848f896;p=thirdparty%2Fsystemd.git

mkosi: Don't skip initrd dependency when building a directory image

mkosi now supports booting directory images in qemu using virtiofs.
However, until distribution kernels build the virtiofs driver directly
into the kernel, we need an initrd to make this work, so make sure to
pull in the initrd preset when building a directory image that could be
bootable to make this work.
---

diff --git a/mkosi.presets/system/mkosi.conf.d/05-initrd.conf b/mkosi.presets/system/mkosi.conf.d/05-initrd.conf
index e5dedafdc34..47a730dc0ea 100644
--- a/mkosi.presets/system/mkosi.conf.d/05-initrd.conf
+++ b/mkosi.presets/system/mkosi.conf.d/05-initrd.conf
@@ -2,7 +2,8 @@
 
 [Match]
 Bootable=!no
-Format=disk
+Format=|disk
+Format=|directory
 
 [Preset]
 Dependencies=initrd