rpm/kdump
SHA256
1
0
Fork 0
forked from pool/kdump
Code Pull Requests Activity

Accepting request 747519 from home:jirislaby:branches:Kernel:kdump

Browse Source 
- add kdump-savedump-search-also-for-vmlinux.xz.patch (bnc#1155921)

OBS-URL: https://build.opensuse.org/request/show/747519
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=186
This commit is contained in:
Petr Tesařík 2019-11-14 12:53:14 +00:00 committed by Git OBS Bridge
parent 7eb188bf45
commit a026f6e20f
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
kdump-savedump-search-also-for-vmlinux.xz.patch Normal file
View File

@ -0,0 +1,54 @@
From: Jiri Slaby <jslaby@suse.cz>
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 <jslaby@suse.cz>
---
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

5
kdump.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 12 08:11:26 UTC 2019 - Jiri Slaby <jslaby@suse.com>
- add kdump-savedump-search-also-for-vmlinux.xz.patch (bnc#1155921)
-------------------------------------------------------------------
Wed Jun 12 15:04:56 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

2
kdump.spec
View File

@ -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}"