From c250d53e24aef1e2d41b12cc45581ca568ab8497 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sun, 23 Oct 2022 06:11:01 +0000
Subject: [PATCH] import kexec-tools-2.0.25-2.el8

---
 .gitignore             | 2 +-
 .kexec-tools.metadata  | 2 +-
 SOURCES/kdump-lib.sh   | 8 +++++++-
 SOURCES/mkdumprd       | 2 +-
 SPECS/kexec-tools.spec | 8 ++++++--
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b2024c..d6b0ce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/1.7.1.tar.gz
 SOURCES/eppic_050615.tar.gz
-SOURCES/kexec-tools-2.0.24.tar.xz
+SOURCES/kexec-tools-2.0.25.tar.xz
diff --git a/.kexec-tools.metadata b/.kexec-tools.metadata
index 34c9eeb..321a87f 100644
--- a/.kexec-tools.metadata
+++ b/.kexec-tools.metadata
@@ -1,3 +1,3 @@
 8f8485c2a1edbc730f4fa1b96ae3ec8d8f1f9761 SOURCES/1.7.1.tar.gz
 a096c8e0892b559f40b01916aae240652f75b68a SOURCES/eppic_050615.tar.gz
-62b7a99779d66ffd07a1684f7b640d32c9697f0c SOURCES/kexec-tools-2.0.24.tar.xz
+78d5d4f7e9d358ca234db9c84a551d9d411eb0b5 SOURCES/kexec-tools-2.0.25.tar.xz
diff --git a/SOURCES/kdump-lib.sh b/SOURCES/kdump-lib.sh
index 3439e7e..aabe9d0 100755
--- a/SOURCES/kdump-lib.sh
+++ b/SOURCES/kdump-lib.sh
@@ -734,7 +734,13 @@ prepare_kdump_bootinfo()
 
     if [[ -z $KDUMP_KERNELVER ]]; then
         KDUMP_KERNELVER=$(uname -r)
-        nondebug_kernelver=$(sed -n -e 's/\(.*\)+debug$/\1/p' <<< "$KDUMP_KERNELVER")
+
+        # Fadump uses the regular bootloader, unlike kdump. So, use the same version
+        # for default kernel and capture kernel unless specified explicitly with
+        # KDUMP_KERNELVER option.
+        if ! is_fadump_capable; then
+            nondebug_kernelver=$(sed -n -e 's/\(.*\)+debug$/\1/p' <<< "$KDUMP_KERNELVER")
+        fi
     fi
 
     # Use nondebug kernel if possible, because debug kernel will consume more memory and may oom.
diff --git a/SOURCES/mkdumprd b/SOURCES/mkdumprd
index 710f4e1..23013d3 100644
--- a/SOURCES/mkdumprd
+++ b/SOURCES/mkdumprd
@@ -226,7 +226,7 @@ check_user_configured_target()
 
     # For user configured target, use $SAVE_PATH as the dump path within the target
     if [ ! -d "$_mnt/$SAVE_PATH" ]; then
-        perror_exit "Dump path \"$_mnt/$SAVE_PATH\" does not exist in dump target \"$_target\""
+        perror_exit "Dump path \"$SAVE_PATH\" does not exist in dump target \"$_target\""
     fi
 
     check_size fs "$_target"
diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec
index b245790..344a52a 100644
--- a/SPECS/kexec-tools.spec
+++ b/SPECS/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
-Version: 2.0.24
-Release: 7%{?dist}
+Version: 2.0.25
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component
@@ -393,6 +393,10 @@ done
 %endif
 
 %changelog
+* Mon Oct 17 2022 Pingfan Liu <piliu@redhat.com> - 2.0.25-2
+- mkdumprd: Improve error messages on non-existing NFS target directories
+- fadump: avoid non-debug kernel use for fadump case
+
 * Sun Sep 18 2022 Pingfan Liu <piliu@redhat.com> - 2.0.24-7
 - kdumpctl: make the kdump.log root-readable-only