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.
This commit is contained in:
Daan De Meyer 2024-08-02 16:23:40 +02:00
parent ea696c5f53
commit edc6592e53
3 changed files with 4 additions and 5 deletions

View File

@ -46,9 +46,6 @@ ExtraTrees=
Initrds=%O/initrd 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 # 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. # and results in lots of errors when building images as a regular user.
SELinuxRelabel=no SELinuxRelabel=no

View File

@ -8,8 +8,9 @@ Release=10
[Content] [Content]
Environment= Environment=
# We'd prefer to use XFS here but it fails to mount on duplicate filesystem UUIDs which # CentOS doesn't support btrfs so we have to use something else. We'd prefer to use XFS here but it
# happens when running tests in parallel so we use ext4 instead. # 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 SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=ext4
# The kernel versions in CentOS Stream 9 doesn't support orphan_file, but later versions of # 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. # mkfs.ext4 enabled it by default, so we disable it explicitly.

View File

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