summaryrefslogtreecommitdiffstats
path: root/mkosi.images
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-06-27 15:45:44 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-06-27 15:45:44 +0200
commit48e7d0e91e1c9d86c660a67a8ca29aa79deee33d (patch)
tree9c83488972aab6e7019c1a4c7ddbcb158873a335 /mkosi.images
parentmkosi: Enable hyperscale-packages-experimental for CentOS (diff)
downloadsystemd-48e7d0e91e1c9d86c660a67a8ca29aa79deee33d.tar.xz
systemd-48e7d0e91e1c9d86c660a67a8ca29aa79deee33d.zip
mkosi: Install btrfs-progs on CentOS as well
Diffstat (limited to 'mkosi.images')
-rw-r--r--mkosi.images/system/mkosi.conf2
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf2
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf2
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf4
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf2
5 files changed, 2 insertions, 10 deletions
diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 562650a8ff..d1ab822132 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 036b0a39a6..7072d08afa 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 5ba20b9ed7..c1f74b1110 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 71e8872ae5..5e39902461 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 9d9566d905..8c3a3d3cda 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