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.

31 files changed, 4 insertions, 0 deletions

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