mkosi: Update to latest

This update introduces the explicit Dependencies= setting, instead
of relying on implicit dependencies via alphanumerical ordering.

We also take the opportunity to rename the "final" preset to the
"system" preset, which seems like a better name.

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 5f3ea2b38de0b720b56ca763540adb408e163f23..5a34e997dbfc3da9507bc96445682cb2843e5e09 100644 (file)
--- 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
similarity index 97%
rename from mkosi.presets/00-base/mkosi.build
rename to mkosi.presets/base/mkosi.build
index cbc305fa4b1520a389c2d44a63906c04d149bcac..d75f1425a582651df8c403aca6bf830d0a44e2a8 100755 (executable)
--- 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.conf
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.conf.d/10-arch.conf
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.conf.d/10-debian.conf
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.conf.d/10-fedora.conf
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.conf.d/10-opensuse.conf
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.conf.d/10-ubuntu.conf
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset
rename to 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
similarity index 100%
rename from mkosi.presets/00-base/mkosi.extra/usr/lib/tmpfiles.d/locale.conf
rename to 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
similarity index 95%
rename from mkosi.presets/10-initrd/mkosi.conf
rename to mkosi.presets/initrd/mkosi.conf
index b672d7363b05efe75c68a4e5c46e595b8b9f8620..78d55ba7cb6cccb60e0132130e7a03e33787cad8 100644 (file)
--- 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
similarity index 100%
rename from mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf
rename to 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
similarity index 100%
rename from mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
rename to 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
similarity index 100%
rename from mkosi.presets/10-initrd/mkosi.conf.d/10-opensuse.conf
rename to mkosi.presets/initrd/mkosi.conf.d/10-opensuse.conf

diff --git a/mkosi.presets/10-initrd/mkosi.postinst b/mkosi.presets/initrd/mkosi.postinst
similarity index 100%
rename from mkosi.presets/10-initrd/mkosi.postinst
rename to mkosi.presets/initrd/mkosi.postinst

diff --git a/mkosi.presets/20-final/mkosi.conf b/mkosi.presets/system/mkosi.conf
similarity index 94%
rename from mkosi.presets/20-final/mkosi.conf
rename to mkosi.presets/system/mkosi.conf
index e1579ad273aaee0bcecc7138588ce86eab01bd0e..aab7a13dbc20e92e54ea6d2ee72b8a97473fab02 100644 (file)
--- 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-arch.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-centos/mkosi.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-centos/mkosi.extra/usr/lib/repart.d/20-root.conf.d/xfs.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-centos/mkosi.repart/10-usr.conf.d/squashfs.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-debian.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-fedora.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/20-kernel-arch.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/20-kernel-fedora.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/20-kernel-opensuse.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.conf.d/20-kernel.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.extra/etc/issue
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.extra/root/.gdbinit
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.extra/usr/lib/repart.d/20-root.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.finalize
rename to mkosi.presets/system/mkosi.finalize

diff --git a/mkosi.presets/20-final/mkosi.kernel.build b/mkosi.presets/system/mkosi.kernel.build
similarity index 100%
rename from mkosi.presets/20-final/mkosi.kernel.build
rename to mkosi.presets/system/mkosi.kernel.build

diff --git a/mkosi.presets/20-final/mkosi.postinst b/mkosi.presets/system/mkosi.postinst
similarity index 100%
rename from mkosi.presets/20-final/mkosi.postinst
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.repart/00-esp.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.repart/10-usr.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.repart/11-usr-verity.conf
rename to 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
similarity index 100%
rename from mkosi.presets/20-final/mkosi.repart/12-usr-verity-sig.conf
rename to mkosi.presets/system/mkosi.repart/12-usr-verity-sig.conf