mkosi: Use new volatile package settings

mkosi just learned to do natively what we currently do with environment
variables and a postinst script, so let's update to the latest version
and start using the new settings instead.

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 7aa64c4e0e50921aa2001b1019e50e468d7ec074..303af4acb1b345166bbb02bc7f89f809fc1ab1b9 100644 (file)
--- a/mkosi.images/system/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Config]
-InitrdInclude=initrd/
-
 [Output]
 @Format=directory
 

diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
index e9aa4080da793439b3851f899b8be178fc4373c7..92d58292f4c7919a390484f720652de1d23825fd 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
@@ -4,9 +4,12 @@
 Distribution=arch
 
 [Content]
-Environment=
-        SYSTEMD_PACKAGES="systemd systemd-ukify systemd-sysvcompat systemd-resolvconf systemd-tests"
-        INITRD_PACKAGES="systemd systemd-sysvcompat"
+VolatilePackages=
+        systemd
+        systemd-ukify
+        systemd-sysvcompat
+        systemd-resolvconf
+        systemd-tests
 
 Packages=
         bpf
@@ -39,3 +42,7 @@ Packages=
 InitrdPackages=
         btrfs-progs
         tpm2-tools
+
+InitrdVolatilePackages=
+        systemd
+        systemd-sysvcompat

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
index 277d17d25ceb618f640544cee8f856547150f0ba..cc9f3e9d11ccba64d7ae0670d473b63c6704efc0 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -5,21 +5,20 @@ Distribution=|centos
 Distribution=|fedora
 
 [Content]
-Environment=
-        SYSTEMD_PACKAGES="systemd
-                          systemd-udev
-                          systemd-container
-                          systemd-repart
-                          systemd-resolved
-                          systemd-networkd
-                          systemd-boot
-                          systemd-tests
-                          systemd-ukify
-                          systemd-pam
-                          systemd-oomd-defaults
-                          systemd-journal-remote
-                          systemd-networkd-defaults"
-        INITRD_PACKAGES="systemd systemd-udev"
+VolatilePackages=
+        systemd
+        systemd-udev
+        systemd-container
+        systemd-repart
+        systemd-resolved
+        systemd-networkd
+        systemd-boot
+        systemd-tests
+        systemd-ukify
+        systemd-pam
+        systemd-oomd-defaults
+        systemd-journal-remote
+        systemd-networkd-defaults
 
 Packages=
         bpftool
@@ -57,3 +56,7 @@ Packages=
 
 InitrdPackages=
         tpm2-tools
+
+InitrdVolatilePackages=
+        systemd
+        systemd-udev

diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index b6f7fdd926b6f3b14d4d6fa59a4440b4c0f0c364..7ece67705a9ad0bd03f7c352bb71ac33e71e0ce5 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -5,22 +5,21 @@ Distribution=|debian
 Distribution=|ubuntu
 
 [Content]
-Environment=
-        SYSTEMD_PACKAGES="systemd
-                          systemd-userdbd
-                          systemd-oomd
-                          systemd-sysv
-                          systemd-tests
-                          systemd-timesyncd
-                          systemd-resolved
-                          systemd-homed
-                          systemd-coredump
-                          systemd-journal-remote
-                          systemd-container
-                          systemd-boot
-                          systemd-ukify
-                          udev"
-        INITRD_PACKAGES="systemd udev"
+VolatilePackages=
+        systemd
+        systemd-userdbd
+        systemd-oomd
+        systemd-sysv
+        systemd-tests
+        systemd-timesyncd
+        systemd-resolved
+        systemd-homed
+        systemd-coredump
+        systemd-journal-remote
+        systemd-container
+        systemd-boot
+        systemd-ukify
+        udev
 
 Packages=
         ^libasan[0-9]+$
@@ -57,3 +56,7 @@ Packages=
 InitrdPackages=
         btrfs-progs
         tpm2-tools
+
+InitrdVolatilePackages=
+        systemd
+        udev

diff --git a/mkosi.images/system/initrd/mkosi.postinst b/mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
similarity index 82%
rename from mkosi.images/system/initrd/mkosi.postinst
rename to mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
index b92bb8ae291585df6216f85104c591532b59b92a..417132f3dd0e50652d88c779fc8270ced4956fe5 100755 (executable)
--- a/mkosi.images/system/initrd/mkosi.postinst
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 
-# shellcheck disable=SC2086
-mkosi-install $INITRD_PACKAGES
-
 # OpenSUSE insists on blacklisting erofs by default because its supposedly a legacy filesystem.
 # See https://github.com/openSUSE/suse-module-tools/pull/71
 rm -f "$BUILDROOT/usr/lib/modprobe.d/60-blacklist_fs-erofs.conf"

diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
index 5d04718ef5a9adfb232566bcb7919d463e2a7b01..24d69ccc277f46d8998d8331128f37dd484eae3f 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -3,19 +3,21 @@
 [Match]
 Distribution=opensuse
 
+[Config]
+InitrdInclude=initrd/
+
 [Content]
-Environment=
-        SYSTEMD_PACKAGES="systemd
-                          udev
-                          systemd-experimental
-                          systemd-boot
-                          systemd-container
-                          systemd-homed
-                          systemd-network
-                          systemd-portable
-                          systemd-sysvcompat
-                          systemd-testsuite"
-        INITRD_PACKAGES="systemd udev systemd-experimental"
+VolatilePackages=
+        systemd
+        udev
+        systemd-experimental
+        systemd-boot
+        systemd-container
+        systemd-homed
+        systemd-network
+        systemd-portable
+        systemd-sysvcompat
+        systemd-testsuite
 
 # We install gawk, gzip, grep, xz, sed, rsync and docbook-xsl-stylesheets here explicitly so that the busybox
 # versions don't get installed instead.
@@ -57,3 +59,8 @@ InitrdPackages=
         kmod
         libkmod2
         tpm2.0-tools
+
+InitrdVolatilePackages=
+        systemd
+        udev
+        systemd-experimental

diff --git a/mkosi.images/system/mkosi.postinst b/mkosi.images/system/mkosi.postinst
deleted file mode 100755 (executable)
index caaf253..0000000
--- a/mkosi.images/system/mkosi.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-# shellcheck disable=SC2086
-mkosi-install $SYSTEMD_PACKAGES