From b209fff3a51b8e57ea5970575bf8d4db4790b620 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 16 Jul 2024 14:15:38 +0200 Subject: [PATCH] mkosi: List library packages explicitly in VolatilePackages= These should already get pulled in as dependencies, but it doesn't hurt to be explicit. --- mkosi.images/exitrd/mkosi.conf.d/10-arch.conf | 1 + mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf | 2 ++ mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf | 3 +++ mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf | 1 + mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf | 3 +++ mkosi.images/initrd/mkosi.conf.d/opensuse.conf | 2 ++ 6 files changed, 12 insertions(+) diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-arch.conf b/mkosi.images/exitrd/mkosi.conf.d/10-arch.conf index a5a6506e94..b5f3194a84 100644 --- a/mkosi.images/exitrd/mkosi.conf.d/10-arch.conf +++ b/mkosi.images/exitrd/mkosi.conf.d/10-arch.conf @@ -6,6 +6,7 @@ Distribution=arch [Content] VolatilePackages= systemd + systemd-libs RemoveFiles= # Arch Linux doesn't split their gcc-libs package so we manually remove diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf b/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf index fb0a498df5..5fd64663b0 100644 --- a/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf +++ b/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf @@ -8,4 +8,6 @@ Packages= patterns-base-minimal_base VolatilePackages= + libsystemd0 + libudev1 systemd diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf b/mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf index 61fe6baee0..9a7e1d8cbb 100644 --- a/mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf +++ b/mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf @@ -5,4 +5,7 @@ Distribution=ubuntu [Content] VolatilePackages= + libsystemd-shared + libsystemd0 + libudev1 systemd diff --git a/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf b/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf index 811d35266b..6607dab089 100644 --- a/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf +++ b/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf @@ -10,4 +10,5 @@ Packages= VolatilePackages= systemd + systemd-libs systemd-udev diff --git a/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf b/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf index 8d56ff206b..093c1bd886 100644 --- a/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf +++ b/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf @@ -10,6 +10,9 @@ Packages= tpm2-tools VolatilePackages= + libsystemd-shared + libsystemd0 + libudev1 systemd systemd-cryptsetup systemd-repart diff --git a/mkosi.images/initrd/mkosi.conf.d/opensuse.conf b/mkosi.images/initrd/mkosi.conf.d/opensuse.conf index e04f8bcd11..9f685e61e5 100644 --- a/mkosi.images/initrd/mkosi.conf.d/opensuse.conf +++ b/mkosi.images/initrd/mkosi.conf.d/opensuse.conf @@ -10,6 +10,8 @@ Packages= tpm2.0-tools VolatilePackages= + libsystemd0 + libudev1 systemd udev systemd-experimental -- 2.25.1