49 files changed, 16 insertions, 9 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 5f3ea2b38d..5a34e997db 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -76,7 +76,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-    - uses: systemd/mkosi@f61dac009ee584797e61a961d508cc52d7f4a03c
+    - uses: systemd/mkosi@9ffcdac128c66935aa5d5a98633fa7498bce92d1
 
     - name: Configure
       run: |
@@ -106,17 +106,17 @@ jobs:
         # For erofs, we have to install linux-modules-extra-azure, but that doesn't match the running kernel
         # version, so we can't load the erofs module. squashfs is a builtin module so we use that instead.
 
-        mkdir -p mkosi.presets/20-final/mkosi.repart/10-usr.conf.d
-        tee mkosi.presets/20-final/mkosi.repart/10-usr.conf.d/squashfs.conf <<- EOF
+        mkdir -p mkosi.presets/system/mkosi.repart/10-usr.conf.d
+        tee mkosi.presets/system/mkosi.repart/10-usr.conf.d/squashfs.conf <<- EOF
         [Partition]
         Format=squashfs
         EOF
 
         # The emergency shell is not useful in the CI, as it just blocks for a long time before the job
         # eventually times out. Override it to just shutdown immediately.
-        mkdir -p mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
-        mkdir -p mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
-        tee mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf <<- EOF
+        mkdir -p mkosi.presets/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
+        mkdir -p mkosi.presets/system/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
+        tee mkosi.presets/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf <<- EOF
         [Unit]
         FailureAction=exit
         [Service]
@@ -124,7 +124,7 @@ jobs:
         ExecStart=
         ExecStart=false
         EOF
-        cp mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf
+        cp mkosi.presets/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf mkosi.presets/system/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf
 
     - name: Generate secure boot key
       run: mkosi --debug genkey
diff --git a/mkosi.presets/00-base/mkosi.build b/mkosi.presets/base/mkosi.build
index cbc305fa4b..d75f1425a5 100755
--- a/mkosi.presets/00-base/mkosi.build
+++ b/mkosi.presets/base/mkosi.build
@@ -10,8 +10,8 @@ if [ "${container:-}" != "mkosi" ]; then
 fi
 
 # We don't want to install our build of systemd in the base image, but use it as an extra tree for the
-# initrd and final images, so override DESTDIR to store it in the output directory so we can reference it as
-# an extra tree in the initrd and final image builds.
+# initrd and system images, so override DESTDIR to store it in the output directory so we can reference it as
+# an extra tree in the initrd and system image builds.
 DESTDIR="$OUTPUTDIR/systemd"
 
 # If mkosi.builddir/ exists mkosi will set $BUILDDIR to it, let's then use it
diff --git a/mkosi.presets/00-base/mkosi.conf b/mkosi.presets/base/mkosi.conf
index eb67bfcf62..eb67bfcf62 100644
--- a/mkosi.presets/00-base/mkosi.conf
+++ b/mkosi.presets/base/mkosi.conf
diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-arch.conf b/mkosi.presets/base/mkosi.conf.d/10-arch.conf
index 7ab0c712ae..7ab0c712ae 100644
--- a/mkosi.presets/00-base/mkosi.conf.d/10-arch.conf
+++ b/mkosi.presets/base/mkosi.conf.d/10-arch.conf
diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/base/mkosi.conf.d/10-centos-fedora.conf
index 4dec24cc20..4dec24cc20 100644
--- a/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/base/mkosi.conf.d/10-centos-fedora.conf
diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.presets/base/mkosi.conf.d/10-debian-ubuntu.conf
index 5550511cf2..5550511cf2 100644
--- a/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi.presets/base/mkosi.conf.d/10-debian-ubuntu.conf
diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-debian.conf b/mkosi.presets/base/mkosi.conf.d/10-debian.conf
index 020b02b61c..020b02b61c 100644
--- a/mkosi.presets/00-base/mkosi.conf.d/10-debian.conf
+++ b/mkosi.presets/base/mkosi.conf.d/10-debian.conf
diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-fedora.conf b/mkosi.presets/base/mkosi.conf.d/10-fedora.conf
index 9c4c12423c..9c4c12423c 100644
--- a/mkosi.presets/00-base/mkosi.conf.d/10-fedora.conf
+++ b/mkosi.presets/base/mkosi.conf.d/10-fedora.conf
diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-opensuse.conf b/mkosi.presets/base/mkosi.conf.d/10-opensuse.conf
index ec91b4901f..ec91b4901f 100644
--- a/mkosi.presets/00-base/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi.presets/base/mkosi.conf.d/10-opensuse.conf
diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-ubuntu.conf b/mkosi.presets/base/mkosi.conf.d/10-ubuntu.conf
index 717809fd03..717809fd03 100644
--- a/mkosi.presets/00-base/mkosi.conf.d/10-ubuntu.conf
+++ b/mkosi.presets/base/mkosi.conf.d/10-ubuntu.conf
diff --git a/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset b/mkosi.presets/base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
index 070af4c67a..070af4c67a 100644
--- a/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
+++ b/mkosi.presets/base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
diff --git a/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset b/mkosi.presets/base/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset
index 710ee7c6f9..710ee7c6f9 100644
--- a/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset
+++ b/mkosi.presets/base/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset
diff --git a/mkosi.presets/00-base/mkosi.extra/usr/lib/tmpfiles.d/locale.conf b/mkosi.presets/base/mkosi.extra/usr/lib/tmpfiles.d/locale.conf
index e1a8e8171a..e1a8e8171a 100644
--- a/mkosi.presets/00-base/mkosi.extra/usr/lib/tmpfiles.d/locale.conf
+++ b/mkosi.presets/base/mkosi.extra/usr/lib/tmpfiles.d/locale.conf
diff --git a/mkosi.presets/10-initrd/mkosi.conf b/mkosi.presets/initrd/mkosi.conf
index b672d7363b..78d55ba7cb 100644
--- a/mkosi.presets/10-initrd/mkosi.conf
+++ b/mkosi.presets/initrd/mkosi.conf
@@ -4,6 +4,9 @@
 Bootable=|auto
 Bootable=|yes
 
+[Preset]
+Dependencies=base
+
 [Output]
 Format=cpio
 
diff --git a/mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf b/mkosi.presets/initrd/mkosi.conf.d/10-centos.conf
index 3f92e52300..3f92e52300 100644
--- a/mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf
+++ b/mkosi.presets/initrd/mkosi.conf.d/10-centos.conf
diff --git a/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf b/mkosi.presets/initrd/mkosi.conf.d/10-default.conf
index 9224b92dd0..9224b92dd0 100644
--- a/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
+++ b/mkosi.presets/initrd/mkosi.conf.d/10-default.conf
diff --git a/mkosi.presets/10-initrd/mkosi.conf.d/10-opensuse.conf b/mkosi.presets/initrd/mkosi.conf.d/10-opensuse.conf
index 5cf2df397e..5cf2df397e 100644
--- a/mkosi.presets/10-initrd/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi.presets/initrd/mkosi.conf.d/10-opensuse.conf
diff --git a/mkosi.presets/10-initrd/mkosi.postinst b/mkosi.presets/initrd/mkosi.postinst
index 6782ddd5fa..6782ddd5fa 100755
--- a/mkosi.presets/10-initrd/mkosi.postinst
+++ b/mkosi.presets/initrd/mkosi.postinst
diff --git a/mkosi.presets/20-final/mkosi.conf b/mkosi.presets/system/mkosi.conf
index e1579ad273..aab7a13dbc 100644
--- a/mkosi.presets/20-final/mkosi.conf
+++ b/mkosi.presets/system/mkosi.conf
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Preset]
+Dependencies=base
+             initrd
+
 [Content]
 Autologin=yes
 BaseTrees=../../mkosi.output/base
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf b/mkosi.presets/system/mkosi.conf.d/10-arch.conf
index 0b15677ff2..0b15677ff2 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-arch.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf
index ad77a2b8d4..ad77a2b8d4 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.presets/system/mkosi.conf.d/10-centos/mkosi.conf
index af4862d4b1..af4862d4b1 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-centos/mkosi.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-centos/mkosi.extra/usr/lib/repart.d/20-root.conf.d/xfs.conf b/mkosi.presets/system/mkosi.conf.d/10-centos/mkosi.extra/usr/lib/repart.d/20-root.conf.d/xfs.conf
index 99b846d3a8..99b846d3a8 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-centos/mkosi.extra/usr/lib/repart.d/20-root.conf.d/xfs.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-centos/mkosi.extra/usr/lib/repart.d/20-root.conf.d/xfs.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-centos/mkosi.repart/10-usr.conf.d/squashfs.conf b/mkosi.presets/system/mkosi.conf.d/10-centos/mkosi.repart/10-usr.conf.d/squashfs.conf
index 393d5f038c..393d5f038c 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-centos/mkosi.repart/10-usr.conf.d/squashfs.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-centos/mkosi.repart/10-usr.conf.d/squashfs.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.presets/system/mkosi.conf.d/10-debian-ubuntu.conf
index 588f833c8f..588f833c8f 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-debian-ubuntu.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf b/mkosi.presets/system/mkosi.conf.d/10-debian.conf
index d4cd53e6f2..d4cd53e6f2 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-debian.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-fedora.conf b/mkosi.presets/system/mkosi.conf.d/10-fedora.conf
index 42d0093a89..42d0093a89 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-fedora.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-fedora.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf b/mkosi.presets/system/mkosi.conf.d/10-opensuse.conf
index 60a2b6dbfc..60a2b6dbfc 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-opensuse.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf b/mkosi.presets/system/mkosi.conf.d/10-ubuntu.conf
index 3290987824..3290987824 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-ubuntu.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-arch.conf b/mkosi.presets/system/mkosi.conf.d/20-kernel-arch.conf
index c97f5deff2..c97f5deff2 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-arch.conf
+++ b/mkosi.presets/system/mkosi.conf.d/20-kernel-arch.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf b/mkosi.presets/system/mkosi.conf.d/20-kernel-centos-fedora.conf
index 14b18727ef..14b18727ef 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
+++ b/mkosi.presets/system/mkosi.conf.d/20-kernel-centos-fedora.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf b/mkosi.presets/system/mkosi.conf.d/20-kernel-debian-ubuntu.conf
index f9413f1da6..f9413f1da6 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
+++ b/mkosi.presets/system/mkosi.conf.d/20-kernel-debian-ubuntu.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-fedora.conf b/mkosi.presets/system/mkosi.conf.d/20-kernel-fedora.conf
index 97091859d1..97091859d1 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-fedora.conf
+++ b/mkosi.presets/system/mkosi.conf.d/20-kernel-fedora.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-opensuse.conf b/mkosi.presets/system/mkosi.conf.d/20-kernel-opensuse.conf
index 6d25af5af2..6d25af5af2 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-opensuse.conf
+++ b/mkosi.presets/system/mkosi.conf.d/20-kernel-opensuse.conf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel.conf b/mkosi.presets/system/mkosi.conf.d/20-kernel.conf
index 838ab005c8..838ab005c8 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel.conf
+++ b/mkosi.presets/system/mkosi.conf.d/20-kernel.conf
diff --git a/mkosi.presets/20-final/mkosi.extra/etc/issue b/mkosi.presets/system/mkosi.extra/etc/issue
index 6aa6fc0ec0..6aa6fc0ec0 100644
--- a/mkosi.presets/20-final/mkosi.extra/etc/issue
+++ b/mkosi.presets/system/mkosi.extra/etc/issue
diff --git a/mkosi.presets/20-final/mkosi.extra/root/.gdbinit b/mkosi.presets/system/mkosi.extra/root/.gdbinit
index 1a2163e3a5..1a2163e3a5 100644
--- a/mkosi.presets/20-final/mkosi.extra/root/.gdbinit
+++ b/mkosi.presets/system/mkosi.extra/root/.gdbinit
diff --git a/mkosi.presets/20-final/mkosi.extra/usr/lib/repart.d/20-root.conf b/mkosi.presets/system/mkosi.extra/usr/lib/repart.d/20-root.conf
index 2f92af248f..2f92af248f 100644
--- a/mkosi.presets/20-final/mkosi.extra/usr/lib/repart.d/20-root.conf
+++ b/mkosi.presets/system/mkosi.extra/usr/lib/repart.d/20-root.conf
diff --git a/mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf b/mkosi.presets/system/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf
index 2f953290d3..2f953290d3 100644
--- a/mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf
+++ b/mkosi.presets/system/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf
diff --git a/mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh b/mkosi.presets/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
index 9bb246263e..9bb246263e 100755
--- a/mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
+++ b/mkosi.presets/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
diff --git a/mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service b/mkosi.presets/system/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service
index 7942cbfa77..7942cbfa77 100644
--- a/mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service
+++ b/mkosi.presets/system/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service
diff --git a/mkosi.presets/20-final/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf b/mkosi.presets/system/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf
index dac79ba4ed..dac79ba4ed 100644
--- a/mkosi.presets/20-final/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf
+++ b/mkosi.presets/system/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf
diff --git a/mkosi.presets/20-final/mkosi.finalize b/mkosi.presets/system/mkosi.finalize
index 74b810c152..74b810c152 100755
--- a/mkosi.presets/20-final/mkosi.finalize
+++ b/mkosi.presets/system/mkosi.finalize
diff --git a/mkosi.presets/20-final/mkosi.kernel.build b/mkosi.presets/system/mkosi.kernel.build
index 64cc48863f..64cc48863f 100755
--- a/mkosi.presets/20-final/mkosi.kernel.build
+++ b/mkosi.presets/system/mkosi.kernel.build
diff --git a/mkosi.presets/20-final/mkosi.postinst b/mkosi.presets/system/mkosi.postinst
index 663fa5c762..663fa5c762 100755
--- a/mkosi.presets/20-final/mkosi.postinst
+++ b/mkosi.presets/system/mkosi.postinst
diff --git a/mkosi.presets/20-final/mkosi.repart/00-esp.conf b/mkosi.presets/system/mkosi.repart/00-esp.conf
index 96b292ecb8..96b292ecb8 100644
--- a/mkosi.presets/20-final/mkosi.repart/00-esp.conf
+++ b/mkosi.presets/system/mkosi.repart/00-esp.conf
diff --git a/mkosi.presets/20-final/mkosi.repart/10-usr.conf b/mkosi.presets/system/mkosi.repart/10-usr.conf
index 343761d097..343761d097 100644
--- a/mkosi.presets/20-final/mkosi.repart/10-usr.conf
+++ b/mkosi.presets/system/mkosi.repart/10-usr.conf
diff --git a/mkosi.presets/20-final/mkosi.repart/11-usr-verity.conf b/mkosi.presets/system/mkosi.repart/11-usr-verity.conf
index b4d45dd7ef..b4d45dd7ef 100644
--- a/mkosi.presets/20-final/mkosi.repart/11-usr-verity.conf
+++ b/mkosi.presets/system/mkosi.repart/11-usr-verity.conf
diff --git a/mkosi.presets/20-final/mkosi.repart/12-usr-verity-sig.conf b/mkosi.presets/system/mkosi.repart/12-usr-verity-sig.conf
index 1841d0a6db..1841d0a6db 100644
--- a/mkosi.presets/20-final/mkosi.repart/12-usr-verity-sig.conf
+++ b/mkosi.presets/system/mkosi.repart/12-usr-verity-sig.conf