From cd53d5dc107407563660e50b5759ba8b7cb3dd19 Mon Sep 17 00:00:00 2001
From: Dan Streetman <ddstreet@ieee.org>
Date: Tue, 21 Apr 2026 16:38:23 -0400
Subject: [PATCH] fix(kdump-utils): Use correct vmlinuz path in kdumpctl

When /boot is not a separate partition, kdumpctl will fail to operate
on any specific kernel version if it is listed multiple times in the
BLS loader entries (for example, with different append
parameters). This fixes it to use only the first matching entry to
determine the kernel image path.

Taken from (not yet merged) upstream PR:
https://github.com/rhkdump/kdump-utils/pull/153
---
 base/comps/components.toml                    |  1 -
 base/comps/kdump-utils/kdump-utils.comp.toml  |  7 +++
 ...y-first-match-in-_find_kernel_path_b.patch | 43 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 base/comps/kdump-utils/kdump-utils.comp.toml
 create mode 100644 base/comps/kdump-utils/kdumpctl-Use-only-first-match-in-_find_kernel_path_b.patch

diff --git a/base/comps/components.toml b/base/comps/components.toml
index 1c8d5463831..d4c1c9f526f 100644
--- a/base/comps/components.toml
+++ b/base/comps/components.toml
@@ -1593,7 +1593,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml"]
 [components.kdsoap]
 [components.kdsoap-ws-discovery-client]
 [components.kdump-anaconda-addon]
-[components.kdump-utils]
 [components.kea]
 [components.keepalived]
 [components.kernel-srpm-macros]
diff --git a/base/comps/kdump-utils/kdump-utils.comp.toml b/base/comps/kdump-utils/kdump-utils.comp.toml
new file mode 100644
index 00000000000..782a1f2a81e
--- /dev/null
+++ b/base/comps/kdump-utils/kdump-utils.comp.toml
@@ -0,0 +1,7 @@
+[components.kdump-utils]
+
+# Upstream (currently unmerged) PR: https://github.com/rhkdump/kdump-utils/pull/153
+[[components.kdump-utils.overlays]]
+description = "Use only first match in _find_kernel_path_by_release()"
+type = "patch-add"
+source = "kdumpctl-Use-only-first-match-in-_find_kernel_path_b.patch"
diff --git a/base/comps/kdump-utils/kdumpctl-Use-only-first-match-in-_find_kernel_path_b.patch b/base/comps/kdump-utils/kdumpctl-Use-only-first-match-in-_find_kernel_path_b.patch
new file mode 100644
index 00000000000..30130b0d7de
--- /dev/null
+++ b/base/comps/kdump-utils/kdumpctl-Use-only-first-match-in-_find_kernel_path_b.patch
@@ -0,0 +1,43 @@
+From c999bac950b817d229549d57f592980f4dc1655b Mon Sep 17 00:00:00 2001
+From: Dan Streetman <ddstreet@ieee.org>
+Date: Tue, 21 Apr 2026 14:00:20 -0400
+Subject: [PATCH] kdumpctl: Use only first match in
+ _find_kernel_path_by_release()
+
+Running 'grubby --info ALL' (or even for a specific kernel version)
+can return multiple entries for the same kernel version/release
+(usually with different append parameters, initrds, etc), so when
+grepping for a specific kernel version/release, we need to use only
+the first match.
+
+This results in kdumpctl failing with the error message (from grubby):
+  "The param $KERNELPATH\n$KERNELPATH is incorrect"
+replacing $KERNELPATH with the actual vmlinuz path.
+
+This bug is hidden when /boot is a separate partition, because the
+grubby script has regex ("/${param##*/}" = "${bls_linux[$i]}") which
+strips all duplicate lines and base path, and successfully matches
+"/vmlinuz-*".
+
+This is reproducable by simply moving the /boot contents into a normal
+dir in the rootfs (instead of separate fs).
+---
+ kdumpctl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kdumpctl b/kdumpctl
+index afcb19d..2c14148 100755
+--- a/kdumpctl
++++ b/kdumpctl
+@@ -1698,7 +1698,7 @@ _find_kernel_path_by_release()
+ 
+ 	# Insert '/' before '+' to cope with grep's EREs
+ 	_release=${_release//+/\\+}
+-	_grubby_kernel_str=$(grubby --info ALL | grep -E "^kernel=.*$_release(/\w+)?\"$")
++	_grubby_kernel_str=$(grubby --info ALL | grep -m 1 -E "^kernel=.*$_release(/\w+)?\"$")
+ 	_kernel_path=$(_filter_grubby_kernel_str "$_grubby_kernel_str")
+ 	if [[ -z $_kernel_path ]]; then
+ 		ddebug "kernel $_release doesn't exist"
+-- 
+2.51.0
+