8 files changed, 49 insertions, 8 deletions
diff --git a/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.conf.d/10-arch/mkosi.conf
index e7288cc19d..7b719ff7b0 100644
--- a/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.conf.d/10-arch/mkosi.conf
@@ -15,16 +15,19 @@ VolatilePackages=
 Packages=
         bind
         bpf
+        btrfs-progs
         compsize
         cryptsetup
         dbus-broker
         dbus-broker-units
         dhcp
+        erofs-utils
         f2fs-tools
         git
         gnutls
         iproute
         iputils
+        knot
         linux
         man-db
         multipath-tools
@@ -39,6 +42,7 @@ Packages=
         psmisc
         python-pexpect
         python-psutil
+        qrencode
         quota-tools
         sbsigntools
         shadow
@@ -50,6 +54,7 @@ Packages=
         vim
 
 InitrdPackages=
+        btrfs-progs
         tpm2-tools
 
 InitrdVolatilePackages=
diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.conf.d/10-centos-fedora/mkosi.conf
index d046eb218b..8882c89b1b 100644
--- a/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -27,8 +27,6 @@ Packages=
         cryptsetup
         device-mapper-event
         device-mapper-multipath
-        dfuzzer
-        dhcp-server
         dnf
         git-core
         glibc-langpack-de
@@ -54,7 +52,6 @@ Packages=
         python3-pexpect
         quota
         rpm
-        sbsigntools
         softhsm
         squashfs-tools
         stress-ng
diff --git a/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.conf.d/10-centos/mkosi.conf
index f9ea9a6596..88b863c5a0 100644
--- a/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi.conf.d/10-centos/mkosi.conf
@@ -5,10 +5,6 @@ Distribution=centos
 
 [Distribution]
 Release=9
-Repositories=epel
-             epel-next
-             hyperscale-packages-main
-             hyperscale-packages-experimental
 
 [Content]
 Environment=
diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf b/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
new file mode 100644
index 0000000000..9e92a4f226
--- /dev/null
+++ b/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=9
+
+[Distribution]
+Repositories=
+        epel
+        epel-next
diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf b/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
new file mode 100644
index 0000000000..11dc96918a
--- /dev/null
+++ b/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+
+[Content]
+Packages=
+        dfuzzer
+        dhcp-server
+        erofs-utils
+        knot
+        qrencode
+        sbsigntools
diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index 41f1972e1f..d282b47fb6 100644
--- a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -36,12 +36,14 @@ VolatilePackages=
         udev
 
 Packages=
+        btrfs-progs
         apt
         bind9-dnsutils
         cryptsetup-bin
         dbus-broker
         dbus-user-session
         dmsetup
+        erofs-utils
         f2fs-tools
         fdisk
         git-core
@@ -49,6 +51,7 @@ Packages=
         iproute2
         iputils-ping
         isc-dhcp-server
+        knot
         libcap-ng-utils
         locales
         man-db
@@ -63,6 +66,7 @@ Packages=
         psmisc
         python3-pexpect
         python3-psutil
+        qrencode
         quota
         softhsm2
         squashfs-tools
@@ -73,6 +77,7 @@ Packages=
         xxd
 
 InitrdPackages=
+        btrfs-progs
         tpm2-tools
 
 InitrdVolatilePackages=
diff --git a/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.conf.d/10-fedora/mkosi.conf
index 1b76d9ac94..92f0c7e9b0 100644
--- a/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi.conf.d/10-fedora/mkosi.conf
@@ -8,10 +8,21 @@ Release=rawhide
 
 [Content]
 Packages=
+        btrfs-progs
         compsize
+        dfuzzer
+        dhcp-server
         dnf5
+        erofs-utils
         f2fs-tools
-        scsi-target-utils
         # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules)
         kernel-modules-extra
         kernel-modules-internal
+        knot
+        qrencode
+        rpmautospec
+        sbsigntools
+        scsi-target-utils
+
+InitrdPackages=
+        btrfs-progs
diff --git a/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.conf.d/10-opensuse/mkosi.conf
index df01c3b6be..2a6bd6e7bf 100644
--- a/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -34,10 +34,12 @@ VolatilePackages=
 Packages=
         bind-utils
         bpftool
+        btrfs-progs
         cryptsetup
         device-mapper
         dhcp-server
         docbook-xsl-stylesheets
+        erofs-utils
         f2fs-tools
         gawk
         git-core
@@ -48,6 +50,7 @@ Packages=
         iputils
         kernel-default
         kmod
+        knot
         multipath-tools
         ncat
         open-iscsi
@@ -61,6 +64,7 @@ Packages=
         python3-pefile
         python3-pexpect
         python3-psutil
+        qrencode
         quota
         rsync
         sbsigntools
@@ -78,6 +82,7 @@ Packages=
         zypper
 
 InitrdPackages=
+        btrfs-progs
         kmod
         tpm2.0-tools