From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 27 Jun 2024 13:45:44 +0000 (+0200)
Subject: mkosi: Install btrfs-progs on CentOS as well
X-Git-Tag: v257-rc1~1033^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48e7d0e91e1c9d86c660a67a8ca29aa79deee33d;p=thirdparty%2Fsystemd.git

mkosi: Install btrfs-progs on CentOS as well
---

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 562650a8ff9..d1ab8221326 100644
--- 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 036b0a39a65..7072d08afa6 100644
--- 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 5ba20b9ed70..c1f74b11103 100644
--- 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 71e8872ae5b..5e399024617 100644
--- 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 9d9566d905a..8c3a3d3cda5 100644
--- 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