Merge pull request #33506 from DaanDeMeyer/mkosi-btrfs

mkosi: Switch back to btrfs

mkosi.conf.d/10-centos.conf

@@ -8,3 +8,4 @@ Distribution=centos
 Repositories=epel
              epel-next
              hyperscale-packages-main
+             hyperscale-packages-experimental

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

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
 

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
 

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

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

mkosi.images/system/mkosi.repart/10-root.conf

@@ -2,7 +2,7 @@
 
 [Partition]
 Type=root
-Format=ext4
+Format=btrfs
 CopyFiles=/
 SizeMinBytes=8G
 SizeMaxBytes=8G