mkosi: Use mkosi.initrd.conf

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.

diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf
index 5680ec44f4e305ad149c63735b82fc42fd133f55..4e5be6718ce3452b0f6cdeb39429bb54af244c2c 100644 (file)
--- a/mkosi/mkosi.conf
+++ b/mkosi/mkosi.conf
@@ -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

diff --git a/mkosi/mkosi.images/initrd/mkosi.conf b/mkosi/mkosi.initrd.conf/mkosi.conf
similarity index 93%
rename from mkosi/mkosi.images/initrd/mkosi.conf
rename to mkosi/mkosi.initrd.conf/mkosi.conf
index 2b731d4397e03ef0e89ef48ea1d896ba49b541a0..1c73f3a328440db5cd17fc8045eddc13aa10daca 100644 (file)
--- a/mkosi/mkosi.images/initrd/mkosi.conf
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf
@@ -2,7 +2,6 @@
 
 [Include]
 Include=
-        mkosi-initrd
         %D/mkosi/mkosi.sanitizers
         %D/mkosi/mkosi.coverage
 

diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/arch.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/arch.conf
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.conf.d/arch.conf
rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/arch.conf

diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/build.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/build.conf
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.conf.d/build.conf
rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/build.conf

diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/centos-fedora.conf
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf
rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/centos-fedora.conf

diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/debian-ubuntu.conf
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf
rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/debian-ubuntu.conf

diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/fedora.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/fedora.conf
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.conf.d/fedora.conf
rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/fedora.conf

diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/opensuse.conf
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.conf.d/opensuse.conf
rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/opensuse.conf

diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/shutdown b/mkosi/mkosi.initrd.conf/mkosi.extra/shutdown
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.extra/shutdown
rename to mkosi/mkosi.initrd.conf/mkosi.extra/shutdown

diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf
rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf

diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/encrypted-var.service
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service
rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/encrypted-var.service

diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service
rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service

diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrdcred.service
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service
rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrdcred.service

diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf
rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf

diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf
similarity index 100%
rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf
rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf