Deal with systemd split packages added in Debian testing

systemd-repart and systemd-cryptsetup were moved to subpackages in
Debian testing. Let's make sure we account for that in mkosi-tools
and mkosi-initrd.

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index e8b265c9facb4cdcb97293530432a68b44f7b6e5..6ea07f51645610c48ea931b8035840ee7fe26adc 100644 (file)
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -9,6 +9,10 @@ Packages=
         kmod     # Not pulled in as a dependency on Debian/Ubuntu
         dmsetup  # Not pulled in as a dependency on Debian/Ubuntu
 
+        ?exact-name(systemd-cryptsetup)
+        ?exact-name(systemd-repart)
+        libcryptsetup12
+
         # xfsprogs pulls in python on Debian (???) and XFS generally
         # isn't used on Debian so we don't install xfsprogs.
         e2fsprogs

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf
index 8b2c7f91931e22e83840afb41a66a9841e8c4684..d7756f57cc38cc48ee54c2f0414b523bd47c98de 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf
@@ -6,6 +6,7 @@ Distribution=|ubuntu
 
 [Content]
 Packages=
+        ?exact-name(systemd-repart)
         ?exact-name(systemd-ukify)
         apt
         archlinux-keyring
@@ -17,6 +18,7 @@ Packages=
         git-core
         grub2
         libarchive-tools
+        libcryptsetup12
         libtss2-dev
         makepkg
         openssh-client