From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 3 May 2024 10:56:50 +0000 (+0200)
Subject: mkosi: Disable ext4's orphan_file feature for centos images
X-Git-Tag: v256-rc2~97^2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffda3c3de9f4cbe9c986d9d4b210b9e6ac532516;p=thirdparty%2Fsystemd.git

mkosi: Disable ext4's orphan_file feature for centos images

Not supported by e2fsck from centos. We also disable building repart
from source in CI as running it from the build directory means repart
will run mkfs.ext4 from the host which doesn't know about the orphan_file
feature causing it to fail.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index fe602685e9c..22e084bf7b3 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -169,7 +169,7 @@ jobs:
             -Dtpm2=enabled \
             -Dlibcryptsetup=enabled \
             -Dlibcurl=enabled \
-            -Drepart=enabled \
+            -Drepart=disabled \
             -Dfirstboot=true \
             -Dsysusers=true \
             -Dtmpfiles=true \
diff --git a/mkosi.conf.d/10-centos.conf b/mkosi.conf.d/10-centos.conf
index ae2706c7917..69fa1350e60 100644
--- a/mkosi.conf.d/10-centos.conf
+++ b/mkosi.conf.d/10-centos.conf
@@ -8,3 +8,6 @@ Distribution=centos
 Repositories=epel
              epel-next
              hyperscale-packages-main
+
+[Content]
+Environment=SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"