diff --git a/kdump-savedump-search-also-for-vmlinux.xz.patch b/kdump-savedump-search-also-for-vmlinux.xz.patch new file mode 100644 index 0000000..a43bb30 --- /dev/null +++ b/kdump-savedump-search-also-for-vmlinux.xz.patch @@ -0,0 +1,54 @@ +From: Jiri Slaby +Date: Wed, 6 Nov 2019 11:35:50 +0100 +Subject: savedump: search also for vmlinux.xz +Patch-mainline: yes +Git-commit: f1ef93a2fd465c6590edddc6dc1fcb3978c7f26b +References: bnc#1155921 + +See https://bugzilla.suse.com/show_bug.cgi?id=1155921 + +Signed-off-by: Jiri Slaby +--- + kdumptool/savedump.cc | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/kdumptool/savedump.cc b/kdumptool/savedump.cc +index 282f52e71f66..b8b6be13c3f8 100644 +--- a/kdumptool/savedump.cc ++++ b/kdumptool/savedump.cc +@@ -596,7 +596,14 @@ string SaveDump::findKernel() + if (binaryroot.exists()) + return binary; + +- // 3: vmlinuz (check if ELF file) ++ // 3: vmlinux.xz ++ (binary = "/boot").appendPath("vmlinux-" + m_crashrelease + ".xz"); ++ (binaryroot = m_rootdir).appendPath(binary); ++ Debug::debug()->dbg("Trying %s", binaryroot.c_str()); ++ if (binaryroot.exists()) ++ return binary; ++ ++ // 4: vmlinuz (check if ELF file) + (binary = "/boot").appendPath("vmlinuz-" + m_crashrelease); + (binaryroot = m_rootdir).appendPath(binary); + Debug::debug()->dbg("Trying %s", binaryroot.c_str()); +@@ -605,14 +612,14 @@ string SaveDump::findKernel() + return binary; + } + +- // 4: image ++ // 5: image + (binary = "/boot").appendPath("image-" + m_crashrelease); + (binaryroot = m_rootdir).appendPath(binary); + Debug::debug()->dbg("Trying %s", binaryroot.c_str()); + if (binaryroot.exists()) + return binary; + +- // 5: Image ++ // 6: Image + (binary = "/boot").appendPath("Image-" + m_crashrelease); + (binaryroot = m_rootdir).appendPath(binary); + Debug::debug()->dbg("Trying %s", binaryroot.c_str()); +-- +2.24.0 + diff --git a/kdump.changes b/kdump.changes index 91aaa65..2b5c5ad 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 12 08:11:26 UTC 2019 - Jiri Slaby + +- add kdump-savedump-search-also-for-vmlinux.xz.patch (bnc#1155921) + ------------------------------------------------------------------- Wed Jun 12 15:04:56 UTC 2019 - Dominique Leuenberger diff --git a/kdump.spec b/kdump.spec index d2db8ca..e681627 100644 --- a/kdump.spec +++ b/kdump.spec @@ -62,6 +62,7 @@ Patch13: %{name}-recover-from-missing-CRASHTIME.patch Patch14: %{name}-fix-multipath-user_friendly_names.patch Patch15: %{name}-Add-skip_balance-option-to-BTRFS-mounts.patch Patch16: %{name}-kdumprd-Look-for-boot-image-and-boot-Image.patch +Patch17: %{name}-savedump-search-also-for-vmlinux.xz.patch BuildRequires: asciidoc BuildRequires: cmake BuildRequires: gcc-c++ @@ -135,6 +136,7 @@ after a crash dump has occured. %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %build export CFLAGS="%{optflags}"