From: Septatrix <24257556+Septatrix@users.noreply.github.com>
Date: Fri, 11 Oct 2024 11:02:41 +0000 (+0200)
Subject: Add erofs and fat utils to initrd
X-Git-Tag: v25~220^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9da7212116de1e32912e0700493022d4fd3b6625;p=thirdparty%2Fmkosi.git

Add erofs and fat utils to initrd

These provide the respective fsck progs
---

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf
index 251881f59..b0bf974ef 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf
@@ -16,7 +16,6 @@ Packages=
         # File system checkers for supported root file systems
         e2fsprogs
         xfsprogs
-        erofs-utils
         dosfstools
 
         # fsck.btrfs is a dummy, checking is done in the kernel.
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/20-epel-packages.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/20-epel-packages.conf
new file mode 100644
index 000000000..a3a75a413
--- /dev/null
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/20-epel-packages.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+
+[Content]
+Packages=
+        # provides fsck.erofs
+        erofs-utils
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf
index 228a0ec87..4bc811d53 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf
@@ -7,6 +7,7 @@ Distribution=fedora
 Packages=
         libfido2
         util-linux-core
+        erofs-utils
 
 RemovePackages=
         # Various packages pull in shadow-utils to create users, we can remove it afterwards