mkosi: Install btrfs-progs on CentOS as well

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 562650a8ff9ac852e621d7db527fca8263f9ec3e..d1ab822132676006cff31a634face4a2b7ff4f34 100644 (file)
--- a/mkosi.images/system/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf
@@ -17,6 +17,7 @@ ExtraTrees=
 PostInstallationScripts=mkosi.sanitizers.chroot
 
 InitrdPackages=
+        btrfs-progs
         findutils
         grep
         sed
@@ -26,6 +27,7 @@ Packages=
         attr
         bash-completion
         bpftrace
+        btrfs-progs
         clang
         coreutils
         curl

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 036b0a39a65a6e2facdfa0d3a4189c40166cf096..7072d08afa6482b7ed91bef2cb226ac614dc860c 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
@@ -20,7 +20,6 @@ VolatilePackages=
 Packages=
         bind
         bpf
-        btrfs-progs
         compiler-rt
         compsize
         cryptsetup
@@ -61,7 +60,6 @@ Packages=
         vim
 
 InitrdPackages=
-        btrfs-progs
         compiler-rt
         tpm2-tools
 

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 5ba20b9ed70f7a834106dc98e41e32e5b54d4d42..c1f74b11103c3be730b0836f2f0da491d984be43 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
@@ -43,7 +43,6 @@ Packages=
         ^libubsan[0-9]+$
         apt
         bind9-dnsutils
-        btrfs-progs
         cryptsetup-bin
         dbus-broker
         dbus-user-session
@@ -83,7 +82,6 @@ Packages=
         xxd
 
 InitrdPackages=
-        btrfs-progs
         libclang-rt-dev
         tpm2-tools
 

diff --git a/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
index 71e8872ae5b9a641dffa3e81247457002badc47f..5e399024617360b4c04734ec8abe599b46a18447 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
@@ -10,7 +10,6 @@ Environment=
         GIT_COMMIT=8153d9b0f978d633c8422011d4c547ae1f0e51a4
 
 Packages=
-        btrfs-progs
         compsize
         dnf5
         f2fs-tools
@@ -18,6 +17,3 @@ Packages=
         # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules)
         kernel-modules-extra
         kernel-modules-internal
-
-InitrdPackages=
-        btrfs-progs

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 9d9566d905ac7aef8e6c9a6bc065c41eb4badd86..8c3a3d3cda599ce5715d9500d32c7fbc288b40af 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -32,7 +32,6 @@ VolatilePackages=
 Packages=
         bind-utils
         bpftool
-        btrfs-progs
         cryptsetup
         device-mapper
         dhcp-server
@@ -88,7 +87,6 @@ Packages=
         xz
 
 InitrdPackages=
-        btrfs-progs
         clang
         kmod
         libkmod2