From b494c7bcb49f95aeff146c8a5b6be6cdbb9f60e9 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 5 Jul 2024 12:00:53 +0200 Subject: [PATCH 1/2] mkosi: Update to latest --- .github/workflows/mkosi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index ac8200ce37..2acde48fb4 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -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 From 5db8db5e346371c7f11805f1a07e7f3e1c48a96b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 5 Jul 2024 09:35:43 +0200 Subject: [PATCH 2/2] mkosi: Use the "default" root filesystem for each distribution Let's not insist on btrfs everywhere. 93440db8b5eae1244aaf5fecfa68050a8b26f3e3 switched us back to btrfs as we wanted to rely on the fact it records timestamps properly. Since we now prefer to do incremental builds on the host with "mkosi -t none" we don't mind anymore that timestamps are not recorded properly so we're not forced to use btrfs anymore. This also increases test coverage as we'll now test with different root filesystems. --- mkosi.images/system/mkosi.conf | 3 +++ mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf | 11 ++++++++--- mkosi.images/system/mkosi.repart/10-root.conf | 1 - 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf index f8a91df5ec..bf08e756e2 100644 --- a/mkosi.images/system/mkosi.conf +++ b/mkosi.images/system/mkosi.conf @@ -15,6 +15,9 @@ ExtraTrees= PostInstallationScripts=mkosi.sanitizers.chroot +Environment= + SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=%F + InitrdPackages= btrfs-progs findutils 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 25059c2292..121257e8e5 100644 --- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf @@ -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 diff --git a/mkosi.images/system/mkosi.repart/10-root.conf b/mkosi.images/system/mkosi.repart/10-root.conf index 3c25dbfb14..c774086fb4 100644 --- a/mkosi.images/system/mkosi.repart/10-root.conf +++ b/mkosi.images/system/mkosi.repart/10-root.conf @@ -2,7 +2,6 @@ [Partition] Type=root -Format=btrfs CopyFiles=/ SizeMinBytes=8G SizeMaxBytes=8G