From: Xavier Moffett <sapphirus@azorium.net>
Date: Fri, 30 May 2025 00:34:06 +0000 (-0400)
Subject: fix: Remove `erofs-utils` from initrd
X-Git-Tag: v26~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6570b21a4bdf287c72bbd56522aa37e442246ab1;p=thirdparty%2Fmkosi.git

fix: Remove `erofs-utils` from initrd

No longer necessary, since fsck is no longer invoked by systemd for
read-only filesystems. This fixes a bug causing the initrd stage
of Ubuntu images to fail.
---

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf
index ee478c9d7..d7e78f241 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf
@@ -8,7 +8,6 @@ Packages=
         btrfs-progs
         e2fsprogs
         xfsprogs
-        erofs-utils
         dosfstools
 
         # Various libraries that are dlopen'ed by systemd
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
index facf2b059..1f73a64e9 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
@@ -6,4 +6,3 @@ Repositories=epel
 [Content]
 Packages=
         btrfs-progs
-        erofs-utils
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
index d8d22e507..aa2358f04 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
@@ -16,7 +16,6 @@ Packages=
         # isn't used on Debian so we don't install xfsprogs.
         btrfs-progs
         e2fsprogs
-        erofs-utils
         dosfstools
 
         util-linux
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 a8b30f06f..ee9def3f9 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf
@@ -8,4 +8,3 @@ Packages=
         btrfs-progs
         libfido2
         util-linux-core
-        erofs-utils
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf
index 121de9367..e39b82f4b 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf
@@ -25,7 +25,6 @@ Packages=
         btrfsprogs
         e2fsprogs
         xfsprogs
-        erofs-utils
         dosfstools
 
         util-linux