mkosi: Rename mkosi.prepare scripts for systemd deps to systemd.prepare

These scripts are reused by multiple images, so let's give them a non-standard name to indicate that. Otherwise it's all too easy to add something to mkosi.prepare for the main image and accidentally have it included in all the subimages as well even though that's not desired.
2025-10-06 00:13:24 +02:00 · 2025-04-17 12:40:17 +02:00
parent 60bcd98228
commit e8881f09c5
21 changed files with 17 additions and 13 deletions
--- a/mkosi/mkosi.conf.d/arch/mkosi.conf
+++ b/mkosi/mkosi.conf.d/arch/mkosi.conf
@@ -4,6 +4,7 @@
 Distribution=arch

 [Content]
+PrepareScripts=systemd.prepare
 VolatilePackages=
        systemd
        systemd-libs
--- a/mkosi/mkosi.conf.d/arch/systemd.prepare
+++ b/mkosi/mkosi.conf.d/arch/systemd.prepare
--- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
+++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -5,6 +5,7 @@ Distribution=|centos
 Distribution=|fedora

 [Content]
+PrepareScripts=systemd.prepare
 VolatilePackages=
        systemd
        systemd-boot
--- a/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
+++ b/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf
@@ -5,6 +5,7 @@ Distribution=|debian
 Distribution=|ubuntu

 [Content]
+PrepareScripts=systemd.prepare
 VolatilePackages=
        libnss-myhostname
        libnss-mymachines
--- a/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf
@@ -11,6 +11,7 @@ Repositories=non-oss
 SandboxTrees=macros.db_backend:/etc/rpm/macros.db_backend

 [Content]
+PrepareScripts=systemd.prepare
 VolatilePackages=
        libsystemd0
        libudev1
--- a/mkosi/mkosi.conf.d/opensuse/systemd.prepare
+++ b/mkosi/mkosi.conf.d/opensuse/systemd.prepare
--- a/mkosi/mkosi.images/exitrd/mkosi.conf.d/arch.conf
+++ b/mkosi/mkosi.images/exitrd/mkosi.conf.d/arch.conf
@@ -4,7 +4,7 @@
 Distribution=arch

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/arch/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/arch/systemd.prepare
 VolatilePackages=
        systemd
        systemd-libs
--- a/mkosi/mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf
+++ b/mkosi/mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf
@@ -5,6 +5,6 @@ Distribution=|centos
 Distribution=|fedora

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
 VolatilePackages=
        systemd-standalone-shutdown
--- a/mkosi/mkosi.images/exitrd/mkosi.conf.d/debian.conf
+++ b/mkosi/mkosi.images/exitrd/mkosi.conf.d/debian.conf
@@ -4,6 +4,6 @@
 Distribution=debian

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
 VolatilePackages=
        systemd-standalone-shutdown
--- a/mkosi/mkosi.images/exitrd/mkosi.conf.d/opensuse.conf
+++ b/mkosi/mkosi.images/exitrd/mkosi.conf.d/opensuse.conf
@@ -4,7 +4,7 @@
 Distribution=opensuse

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/systemd.prepare
 Packages=
        diffutils
        grep
--- a/mkosi/mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf
+++ b/mkosi/mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf
@@ -4,7 +4,7 @@
 Distribution=ubuntu

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
 VolatilePackages=
        libsystemd-shared
        libsystemd0
--- a/mkosi/mkosi.images/initrd/mkosi.conf.d/arch.conf
+++ b/mkosi/mkosi.images/initrd/mkosi.conf.d/arch.conf
@@ -4,7 +4,7 @@
 Distribution=arch

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/arch/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/arch/systemd.prepare
 Packages=
        btrfs-progs
        tpm2-tools
--- a/mkosi/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf
+++ b/mkosi/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf
@@ -5,7 +5,7 @@ Distribution=|centos
 Distribution=|fedora

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
 Packages=
        tpm2-tools

--- a/mkosi/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf
+++ b/mkosi/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf
@@ -5,7 +5,7 @@ Distribution=|debian
 Distribution=|ubuntu

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
 Packages=
        btrfs-progs
        tpm2-tools
--- a/mkosi/mkosi.images/initrd/mkosi.conf.d/opensuse.conf
+++ b/mkosi/mkosi.images/initrd/mkosi.conf.d/opensuse.conf
@@ -4,7 +4,7 @@
 Distribution=opensuse

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/systemd.prepare
 Packages=
        btrfs-progs
        kmod
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
@@ -4,7 +4,7 @@
 Distribution=arch

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/arch/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/arch/systemd.prepare
 Packages=
        inetutils
        iproute
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
@@ -5,7 +5,7 @@ Distribution=|centos
 Distribution=|fedora

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
 Packages=
        hostname
        iproute
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf
@@ -5,7 +5,7 @@ Distribution=|debian
 Distribution=|ubuntu

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
 Packages=
        hostname
        iproute2
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
@@ -4,7 +4,7 @@
 Distribution=opensuse

 [Content]
-PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/mkosi.prepare
+PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/systemd.prepare
 Packages=
        diffutils
        grep