From 894477e6c11a61ad3820d8e29caecaa1da2d12cd Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 13 Feb 2026 22:19:28 +0100 Subject: [PATCH] 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. --- mkosi/mkosi.conf | 2 -- mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.conf | 1 - .../initrd => mkosi.initrd.conf}/mkosi.conf.d/arch.conf | 0 .../initrd => mkosi.initrd.conf}/mkosi.conf.d/build.conf | 0 .../mkosi.conf.d/centos-fedora.conf | 0 .../mkosi.conf.d/debian-ubuntu.conf | 0 .../initrd => mkosi.initrd.conf}/mkosi.conf.d/fedora.conf | 0 .../initrd => mkosi.initrd.conf}/mkosi.conf.d/opensuse.conf | 0 .../initrd => mkosi.initrd.conf}/mkosi.extra/shutdown | 0 .../mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf | 0 .../mkosi.extra/usr/lib/systemd/system/encrypted-var.service | 0 .../mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service | 0 .../mkosi.extra/usr/lib/systemd/system/initrdcred.service | 0 .../systemd-pcrphase-initrd.service.d/exit-on-failure.conf | 0 .../exit-on-failure.conf | 0 15 files changed, 3 deletions(-) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.conf (93%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.conf.d/arch.conf (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.conf.d/build.conf (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.conf.d/centos-fedora.conf (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.conf.d/debian-ubuntu.conf (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.conf.d/fedora.conf (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.conf.d/opensuse.conf (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.extra/shutdown (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.extra/usr/lib/systemd/system/encrypted-var.service (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.extra/usr/lib/systemd/system/initrdcred.service (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf (100%) rename mkosi/{mkosi.images/initrd => mkosi.initrd.conf}/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf (100%) diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf index 5680ec44f4e..4e5be6718ce 100644 --- 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 2b731d4397e..1c73f3a3284 100644 --- 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 -- 2.47.3