From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 19 Mar 2025 10:09:04 +0000 (+0100)
Subject: fmf: Drop btrfs workaround
X-Git-Tag: v258-rc1~1040^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f2700287f8a14e18abbe43802a448df011f01e1;p=thirdparty%2Fsystemd.git

fmf: Drop btrfs workaround

We switched to ext4 in mkosi.repart itself, so drop the workaround
in the fmf integration test script.
---

diff --git a/test/fmf/integration-tests/test.sh b/test/fmf/integration-tests/test.sh
index 5c9f03c960c..64e6c48fd26 100755
--- a/test/fmf/integration-tests/test.sh
+++ b/test/fmf/integration-tests/test.sh
@@ -108,9 +108,6 @@ EOF
     touch /etc/yum.repos.d/mkosi.repo
 fi
 
-# TODO: drop once BTRFS regression is fixed in kernel 6.13
-sed -i "s/Format=btrfs/Format=ext4/" mkosi.repart/10-root.conf
-
 # If we don't have KVM, skip running in qemu, as it's too slow. But try to load the module first.
 modprobe kvm || true
 if [[ ! -e /dev/kvm ]]; then