From 81d3cc344d20cee900396bb02977d1cbe8a11034 Mon Sep 17 00:00:00 2001
From: Pingfan Liu <piliu@redhat.com>
Date: Thu, 20 Apr 2023 11:26:34 +0800
Subject: [PATCH] kdump-lib: fix the matching pattern for debug-kernel

On aarch64, a 64k kernel's name looks like:
vmlinuz-5.14.0-300.el9.aarch64+64k and the corresponding debug kernel's
name looks like: vmlinuz-5.14.0-300.el9.aarch64+64k-debug, which ends
with the suffix -debug instead of +debug.

Fix the matching pattern by [+|-]debug

Signed-off-by: Pingfan Liu <piliu@redhat.com>
Reviewed-by: Philipp Rudo <prudo@redhat.com>
---
 kdump-lib.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kdump-lib.sh b/kdump-lib.sh
index 3f9e423..c6bf378 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -536,12 +536,13 @@ _get_kdump_kernel_version()
 	fi
 
 	_version=$(uname -r)
-	if [[ ! "$_version" =~ \+debug$ ]]; then
+	if [[ ! "$_version" =~ [+|-]debug$ ]]; then
 		echo "$_version"
 		return
 	fi
 
 	_version_nondebug=${_version%+debug}
+	_version_nondebug=${_version_nondebug%-debug}
 	if [[ -f "$(prepare_kdump_kernel "$_version_nondebug")" ]]; then
 		dinfo "Use of debug kernel detected. Trying to use $_version_nondebug"
 		echo "$_version_nondebug"