Backport PR #1344 to pull in required filesystem packages

0001-Explicitly-pull-in-more-filesystem-packages.patch

@@ -0,0 +1,38 @@
+From cce0772ac2807f85b6dbe53f5af86718cc3017e3 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Thu, 7 Sep 2023 12:04:54 -0700
+Subject: [PATCH] Explicitly pull in more filesystem packages
+
+Turns out we've been relying on udisks2 dependencies to pull in
+several filesystem tools packages that anaconda actually needs
+to create and read supported filesystems. udisks2 just changed
+all those dependencies to Recommends, which don't get pulled
+into the installer environment. So we need lorax to specifically
+list all of these. e2fsprogs was already being pulled in through
+some other dep chain, but let's explicitly list it just to make
+sure we don't hit the same problem in future. From a look through
+the blivet code, I don't think pulling in udftools, exfatprogs
+or nilfs-utils will be useful, but we can check that with
+@vojtechtrefny .
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ share/templates.d/99-generic/runtime-install.tmpl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl
+index 93b76fb4..38b1d0cd 100644
+--- a/share/templates.d/99-generic/runtime-install.tmpl
++++ b/share/templates.d/99-generic/runtime-install.tmpl
+@@ -118,7 +118,7 @@ installpkg systemd-sysv systemd-units
+ installpkg rsyslog
+ 
+ ## filesystem tools
+-installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs
++installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs dosfstools e2fsprogs f2fs-tools
+ installpkg system-storage-manager
+ installpkg device-mapper-persistent-data
+ installpkg xfsdump
+-- 
+2.41.0
+

lorax.spec

@@ -4,7 +4,7 @@
 
 Name:           lorax
 Version:        39.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 License:        GPL-2.0-or-later
@@ -18,6 +18,10 @@ Source0:        %{name}-%{version}.tar.gz
 # https://bugzilla.redhat.com/show_bug.cgi?id=2231605
 # cut qcom firmwares from x86_64 installer images to save space
 Patch0:         0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch
+# https://github.com/weldr/lorax/pull/1344
+# pull in filesystem tools packages we previously relied on udisks2
+# to pull in
+Patch1:         0001-Explicitly-pull-in-more-filesystem-packages.patch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -172,6 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_datadir}/lorax/templates.d/*
 
 %changelog
+* Thu Sep 07 2023 Adam Williamson <awilliam@redhat.com> - 39.4-3
+- Backport PR #1344 to pull in required filesystem packages
+
 * Mon Aug 28 2023 Adam Williamson <awilliam@redhat.com> - 39.4-2
 - Backport PR #1338 to cut qcom firmwares and save space