mkosi: Switch from btrfs to ext4

Mounting multiple btrfs filesystems with the same fsid only works
properly from kernel 6.7 onwards. Let's switch to ext4 for now which
does support this.

diff --git a/mkosi.conf b/mkosi.conf
index 9d23f4f8b2c8f99aa02edd46432bdfdac221b74f..2da8804a7ef0562c7b08a131fbe2f8d1494aac6c 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -14,6 +14,9 @@ MinimumVersion=23~devel
 Environment=ASAN_OPTIONS=verify_asan_link_order=false
             MKOSI_ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
             MKOSI_UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
+            # The kernel versions in CentOS Stream 9 and Ubuntu 22.04 don't support orphan_file, but later
+            # versions of mkfs.ext4 enabled it by default, so we disable it explicitly.
+            SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"
 @SELinuxRelabel=no
 BuildSourcesEphemeral=yes
 

diff --git a/mkosi.conf.d/10-centos.conf b/mkosi.conf.d/10-centos.conf
index 69fa1350e605a395a31b3d38bd76fa0aa67bd51d..ae2706c791712918f0eebd939481dc6585c73e3a 100644 (file)
--- a/mkosi.conf.d/10-centos.conf
+++ b/mkosi.conf.d/10-centos.conf
@@ -8,6 +8,3 @@ Distribution=centos
 Repositories=epel
              epel-next
              hyperscale-packages-main
-
-[Content]
-Environment=SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
index 60ea1cb6a3b21e550009332e00c8fa9fa1b0605c..843b96d9a61f37b02153f53f68df5ce6a258d2d3 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
@@ -3,9 +3,6 @@
 [Match]
 Distribution=centos
 
-[Output]
-RepartDirectories=mkosi.repart
-
 [Content]
 Packages=
         rpmautospec-rpm-macros

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.repart/10-root.conf.d/xfs.conf b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.repart/10-root.conf.d/xfs.conf
deleted file mode 100644 (file)
index a50de68..0000000
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.repart/10-root.conf.d/xfs.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Partition]
-# btrfs isn't supported on CentOS. Ideally we'd use xfs instead but we lose xattrs when doing rootless
-# population of xfs which is required for testing SELinux so let's do ext4 instead.
-Format=ext4

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