From 222fdb21aa1d349febd45bc6623ef76f33c01903 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 11 Jun 2025 14:53:28 +0000
Subject: [PATCH] import UBI dracut-057-88.git20250311.el9_6

---
 SOURCES/0089.patch | 33 +++++++++++++++++++++++++++++++++
 SPECS/dracut.spec  |  6 +++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0089.patch

diff --git a/SOURCES/0089.patch b/SOURCES/0089.patch
new file mode 100644
index 0000000..f121f2d
--- /dev/null
+++ b/SOURCES/0089.patch
@@ -0,0 +1,33 @@
+From 6d0f4d436f54ac07eb3ffcc8879b8f8477506a00 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 20 May 2025 09:31:52 +0200
+Subject: [PATCH] fix(dracut.sh): don't pass empty string as dir
+
+That causes dropindirs_sort() to look for .conf files in / due to
+expansion:
+
+    for d in "$@"; do
+        for i in "$d/"*"$suffix"; do
+
+Fixes #1275
+
+(cherry picked from commit 000cfa0c278c0858e81c8dd2ff7231f069f0afb1)
+
+Resolves: RHEL-95895
+---
+ dracut.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index dcdeaf5f..43bc2ad0 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -962,7 +962,7 @@ if [[ -f $conffile ]]; then
+ fi
+ 
+ # source our config dir
+-for f in $(dropindirs_sort ".conf" "$confdir" "$add_confdir" "$dracutbasedir/dracut.conf.d"); do
++for f in $(dropindirs_sort ".conf" "$confdir" ${add_confdir:+"$add_confdir"} "$dracutbasedir/dracut.conf.d"); do
+     check_conf_file "$f"
+     # shellcheck disable=SC1090
+     [[ -e $f ]] && . "$f"
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index 709b869..4f0416e 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -5,7 +5,7 @@
 # strip the automatically generated dep here and instead co-own the
 # directory.
 %global __requires_exclude pkg-config
-%define dist_free_release 87.git20250311
+%define dist_free_release 88.git20250311
 
 Name: dracut
 Version: 057
@@ -115,6 +115,7 @@ Patch83: 0083.patch
 Patch84: 0084.patch
 Patch85: 0085.patch
 Patch86: 0086.patch
+Patch89: 0089.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
@@ -571,6 +572,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
 
 %changelog
+* Mon Jun 09 2025 Pavel Valena <pvalena@redhat.com> - 057-88.git20250311
+- fix(dracut.sh): don't pass empty string as dir
+
 * Tue Mar 11 2025 Pavel Valena <pvalena@redhat.com> - 057-87.git20250311
 - fix(rescue): create hmac file for rescue kernel