From edc6592e532806fe9ac28400138d5d4e1492a7d0 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 2 Aug 2024 16:23:40 +0200 Subject: [PATCH] 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. --- mkosi.conf | 3 --- mkosi.conf.d/10-centos/mkosi.conf | 5 +++-- mkosi.repart/10-root.conf | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mkosi.conf b/mkosi.conf index e6b0e41135c..6545e1a41fd 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -46,9 +46,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 d97b08138e6..dd462efcee3 100644 --- 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 c774086fb45..3c25dbfb14d 100644 --- 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