[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/

["Sam James" <sam@gentoo.org>]

commit:     1909b3bee6c4aa79d71591433830c7381795c89d
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Mar 24 00:51:08 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 24 01:55:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1909b3be

sys-kernel/dracut: do not call mdadm with full path

Bug: https://bugs.gentoo.org/951284
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/41255
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{dracut-106-r1.ebuild => dracut-106-r2.ebuild}      |  2 ++
 .../dracut/files/dracut-106-fix-mdraid-module.patch     | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/sys-kernel/dracut/dracut-106-r1.ebuild b/sys-kernel/dracut/dracut-106-r2.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-106-r1.ebuild
rename to sys-kernel/dracut/dracut-106-r2.ebuild
index 8dfb986ced53..db0e73237fc2 100644
--- a/sys-kernel/dracut/dracut-106-r1.ebuild
+++ b/sys-kernel/dracut/dracut-106-r2.ebuild
@@ -103,6 +103,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-106-acct-user-group-gentoo.patch
 	# https://github.com/dracut-ng/dracut-ng/pull/1207
 	"${FILESDIR}"/${PN}-106-fix-rngd-module.patch
+	# https://github.com/dracut-ng/dracut-ng/pull/1250
+	"${FILESDIR}"/${PN}-106-fix-mdraid-module.patch
 )
 
 pkg_setup() {

diff --git a/sys-kernel/dracut/files/dracut-106-fix-mdraid-module.patch b/sys-kernel/dracut/files/dracut-106-fix-mdraid-module.patch
new file mode 100644
index 000000000000..3692d1fc2fd8
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-106-fix-mdraid-module.patch
@@ -0,0 +1,17 @@
+https://github.com/dracut-ng/dracut-ng/pull/1250
+diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
+index 8ce5f2ee..b0ab8411 100755
+--- a/modules.d/90mdraid/module-setup.sh
++++ b/modules.d/90mdraid/module-setup.sh
+@@ -46,7 +46,7 @@ cmdline() {
+         [[ ${host_fs_types[$dev]} != *_raid_member ]] && continue
+ 
+         UUID=$(
+-            /sbin/mdadm --examine --export "$dev" \
++            mdadm --examine --export "$dev" \
+                 | while read -r line || [[ "$line" ]]; do
+                     [[ ${line#MD_UUID=} == "$line" ]] && continue
+                     printf "%s" "${line#MD_UUID=} "
+-- 
+2.48.1
+