Merge pull request #33640 from DaanDeMeyer/ext4-split

mkosi: Use the "default" root filesystem for each distribution
2024-07-08 12:56:09 +02:00
parent c80c5c20d4 5db8db5e34
commit 6b247bad9c
4 changed files with 12 additions and 5 deletions
@@ -92,7 +92,7 @@ jobs:

    steps:
    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-    - uses: systemd/mkosi@70aa901697f12182ccaa24e2325867d275479b55
+    - uses: systemd/mkosi@9f280901d5ba81ce63072e0892649c27d41dd169

    # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
    # immediately, we remove the files in the background. However, we first move them to a different location
@@ -15,6 +15,9 @@ ExtraTrees=

 PostInstallationScripts=mkosi.sanitizers.chroot

+Environment=
+        SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=%F
+
 InitrdPackages=
        btrfs-progs
        findutils
@@ -5,9 +5,14 @@ Distribution=centos

 [Content]
 Environment=
-        # 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.
-        Environment=SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"
+        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.
+                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.
+                SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"
+
        GIT_URL=https://git.centos.org/rpms/systemd.git
        GIT_BRANCH=c9s-sig-hyperscale
        GIT_COMMIT=8cf2aed0181920611421384f7374720db269d6c7
@@ -2,7 +2,6 @@

 [Partition]
 Type=root
-Format=btrfs
 CopyFiles=/
 SizeMinBytes=8G
 SizeMaxBytes=8G