]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
ci: Use ext4 temporarily
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 29 May 2025 18:01:16 +0000 (20:01 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 4 Jun 2025 13:05:51 +0000 (15:05 +0200)
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.

.github/workflows/ci.yml
mkosi/distributions/fedora.py
mkosi/distributions/opensuse.py

index 31a4da7937b9ecf3e9d284fd027aa8f8c5201d14..3a4f6b089b1881ad5ed00ddbc92c4bda8cf97374 100644 (file)
@@ -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
index 833e820e21076e3240ace04e385d14003757609c..fd532f3060ab2e52b7711b01341bd21d82cd5db7 100644 (file)
@@ -98,7 +98,7 @@ class Installer(DistributionInstaller):
 
     @classmethod
     def filesystem(cls) -> str:
-        return "btrfs"
+        return "ext4"
 
     @classmethod
     def package_type(cls) -> PackageType:
index e959cfbd6ea825e32b12239ff8a75a8a08e5b098..6c119c1846e942ec370b265f1d091d3ce2b9e0f2 100644 (file)
@@ -25,7 +25,7 @@ class Installer(DistributionInstaller):
 
     @classmethod
     def filesystem(cls) -> str:
-        return "btrfs"
+        return "ext4"
 
     @classmethod
     def package_type(cls) -> PackageType: