From 47391b4a6df31111b17d9ccf3b7d6571d4bf0cf4 Mon Sep 17 00:00:00 2001
From: Pingfan Liu <piliu@redhat.com>
Date: Jun 07 2023 03:59:42 +0000
Subject: kdump-lib: fix the matching pattern for debug-kernel


Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2165839
Upstream: Fedora
Conflict: None

commit 81d3cc344d20cee900396bb02977d1cbe8a11034
Author: Pingfan Liu <piliu@redhat.com>
Date:   Thu Apr 20 11:26:34 2023 +0800

    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>

Signed-off-by: Pingfan Liu <piliu@redhat.com>

---

diff --git a/kdump-lib.sh b/kdump-lib.sh
index 6fcf9fa..75d55f5 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -658,12 +658,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"