From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 29 May 2025 18:01:16 +0000 (+0200)
Subject: ci: Use ext4 temporarily
X-Git-Tag: v26~208^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f899e770ed4b5d370d47706c5f5bb9b26cf035ca;p=thirdparty%2Fmkosi.git

ci: Use ext4 temporarily

The commit causing https://lore.kernel.org/linux-fsdevel/20250115185608.GA2223535@zen.localdomain/T/#u
got backported to the ubuntu stable kernel. While it has been reverted
upstream, the revert still hasn't reached the ubuntu stable kernel,
so let's use ext4 temporarily until that's the case.
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31a4da793..3a4f6b089 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -182,6 +182,9 @@ jobs:
           DefaultDeviceTimeoutSec=180
           EOF
 
+          # TODO: Use $SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT once we drop support for Ubuntu Noble.
+          sed -i 's/return "btrfs"/return "ext4"/' mkosi/distributions/*.py
+
           # fail if the script already exists, to avoid hard to debug CI errors
           [[ -f mkosi.configure ]] && exit 1
           tee mkosi.configure <<EOF
diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 833e820e2..fd532f306 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -98,7 +98,7 @@ class Installer(DistributionInstaller):
 
     @classmethod
     def filesystem(cls) -> str:
-        return "btrfs"
+        return "ext4"
 
     @classmethod
     def package_type(cls) -> PackageType:
diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index e959cfbd6..6c119c184 100644
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -25,7 +25,7 @@ class Installer(DistributionInstaller):
 
     @classmethod
     def filesystem(cls) -> str:
-        return "btrfs"
+        return "ext4"
 
     @classmethod
     def package_type(cls) -> PackageType: