mkosi: Switch back to btrfs

The next commit will introduce a way to iterate on integration
tests which depends on btrfs specific features.

We leave CentOS on ext4 as its kernel does not support btrfs.

(cherry picked from commit edc6592e532806fe9ac28400138d5d4e1492a7d0)

diff --git a/mkosi.conf b/mkosi.conf
index 527d08a1614f21b05c1b236ddba5dd6b21f7edb9..84aeeca164bef410bcbb071fa30e8038dcd17a57 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -47,9 +47,6 @@ ExtraTrees=
 
 Initrds=%O/initrd
 
-Environment=
-        SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=%F
-
 # Disable relabeling by default as it only matters for TEST-06-SELINUX, takes a non-trivial amount of time
 # and results in lots of errors when building images as a regular user.
 SELinuxRelabel=no

diff --git a/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.conf.d/10-centos/mkosi.conf
index d97b08138e6057ba1f2f72e41529bedf57d22fd2..dd462efcee38c6ccf57f9311204ca70ef09530c2 100644 (file)
--- a/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi.conf.d/10-centos/mkosi.conf
@@ -8,8 +8,9 @@ Release=10
 
 [Content]
 Environment=
-        # We'd prefer to use XFS here but it fails to mount on duplicate filesystem UUIDs which
-        # happens when running tests in parallel so we use ext4 instead.
+        # CentOS doesn't support btrfs so we have to use something else. We'd prefer to use XFS here but it
+        # fails to mount on duplicate filesystem UUIDs which happens when running tests in parallel so we use
+        # ext4 instead.
         SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=ext4
         # The kernel versions in CentOS Stream 9 doesn't support orphan_file, but later versions of
         # mkfs.ext4 enabled it by default, so we disable it explicitly.

diff --git a/mkosi.repart/10-root.conf b/mkosi.repart/10-root.conf
index c774086fb4579ec899c23b54b9962188c8200c08..3c25dbfb14da7ad17f28d64d9ea94ea061016742 100644 (file)
--- a/mkosi.repart/10-root.conf
+++ b/mkosi.repart/10-root.conf
@@ -2,6 +2,7 @@
 
 [Partition]
 Type=root
+Format=btrfs
 CopyFiles=/
 SizeMinBytes=8G
 SizeMaxBytes=8G