]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Use mkosi.initrd.conf
authorDaan De Meyer <daan@amutable.com>
Fri, 13 Feb 2026 21:19:28 +0000 (22:19 +0100)
committerDaan De Meyer <daan@amutable.com>
Sat, 14 Feb 2026 09:36:14 +0000 (10:36 +0100)
A more straightforward way to extend the default initrd rather than
using a subimage. This mainly allows us to take advantage of mkosi
automatically figuring out whether the initrd needs to be built or not,
speeding up builds when building directory images as the initrd can be
skipped in that case.

15 files changed:
mkosi/mkosi.conf
mkosi/mkosi.initrd.conf/mkosi.conf [moved from mkosi/mkosi.images/initrd/mkosi.conf with 93% similarity]
mkosi/mkosi.initrd.conf/mkosi.conf.d/arch.conf [moved from mkosi/mkosi.images/initrd/mkosi.conf.d/arch.conf with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.conf.d/build.conf [moved from mkosi/mkosi.images/initrd/mkosi.conf.d/build.conf with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.conf.d/centos-fedora.conf [moved from mkosi/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.conf.d/debian-ubuntu.conf [moved from mkosi/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.conf.d/fedora.conf [moved from mkosi/mkosi.images/initrd/mkosi.conf.d/fedora.conf with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.conf.d/opensuse.conf [moved from mkosi/mkosi.images/initrd/mkosi.conf.d/opensuse.conf with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.extra/shutdown [moved from mkosi/mkosi.images/initrd/mkosi.extra/shutdown with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf [moved from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/encrypted-var.service [moved from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service [moved from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrdcred.service [moved from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf [moved from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf with 100% similarity]
mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf [moved from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf with 100% similarity]

index 5680ec44f4e305ad149c63735b82fc42fd133f55..4e5be6718ce3452b0f6cdeb39429bb54af244c2c 100644 (file)
@@ -3,7 +3,6 @@
 [Config]
 MinimumVersion=commit:d6ddc66acb05d3d761d3f600c6b029319db9ae95
 Dependencies=
-        initrd
         minimal-base
         minimal-0
         minimal-1
@@ -58,7 +57,6 @@ ExtraTrees=
         %O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template
         %O/initrd:/exitrd
 
-Initrds=%O/initrd
 KernelInitrdModules=default
 
 # Disable relabeling by default as it only matters for TEST-06-SELINUX, takes a non-trivial amount of time
similarity index 93%
rename from mkosi/mkosi.images/initrd/mkosi.conf
rename to mkosi/mkosi.initrd.conf/mkosi.conf
index 2b731d4397e03ef0e89ef48ea1d896ba49b541a0..1c73f3a328440db5cd17fc8045eddc13aa10daca 100644 (file)
@@ -2,7 +2,6 @@
 
 [Include]
 Include=
-        mkosi-initrd
         %D/mkosi/mkosi.sanitizers
         %D/mkosi/mkosi.coverage