pool/kdump
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- kdump-kdumprd-Look-for-boot-image-and-boot-Image.patch: kdumprd:

Browse Source 
Look for /boot/image-* and /boot/Image-* (bsc#1132799).

OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=182
This commit is contained in:
Petr Tesařík 2019-04-26 07:38:38 +00:00 committed by Git OBS Bridge
parent 594a5a221d
commit 5d3206ffa8
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
kdump-kdumprd-Look-for-boot-image-and-boot-Image.patch Normal file
View File

@ -0,0 +1,33 @@
From d332bb87cd1d093f8b78ff3d79413d84fa26dea3 Mon Sep 17 00:00:00 2001
From: Petr Tesarik <ptesarik@suse.com>
Date: Fri, 26 Apr 2019 09:27:40 +0200
Subject: kdumprd: Look for /boot/image-* and /boot/Image-*
References: bsc#1132799
Upstream: merged
Git-commit: d332bb87cd1d093f8b78ff3d79413d84fa26dea3
These kernel image names are used on s390(x) and arm*/aarch64,
respectively. Without this change, the path to the kernel must be
given explicitly on the command line if a specific kernel version is
required.
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
---
init/mkdumprd | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/init/mkdumprd
+++ b/init/mkdumprd
@@ -125,9 +125,9 @@ shift $(($OPTIND -1))
if [ -z "$KERNEL" ] ; then
if [ -n "$KERNELVERSION" ] ; then
KERNEL=/boot/vmlinuz-$KERNELVERSION
- if ! [ -f "$KERNEL" ] ; then
- KERNEL=/boot/vmlinux-$KERNELVERSION
- fi
+ test -f "$KERNEL" || KERNEL=/boot/image-$KERNELVERSION
+ test -f "$KERNEL" || KERNEL=/boot/Image-$KERNELVERSION
+ test -f "$KERNEL" || KERNEL=/boot/vmlinux-$KERNELVERSION
else
output=$(kdumptool find_kernel $find_kernel_args)
KERNEL=$(echo "$output" | grep ^Kernel | cut -f 2)

6
kdump.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 26 07:36:54 UTC 2019 - Petr Tesarik <ptesarik@suse.com>
- kdump-kdumprd-Look-for-boot-image-and-boot-Image.patch: kdumprd:
Look for /boot/image-* and /boot/Image-* (bsc#1132799).
-------------------------------------------------------------------
Tue Apr 16 09:12:51 UTC 2019 - ptesarik@suse.com

2
kdump.spec
View File

@ -61,6 +61,7 @@ Patch12: %{name}-fallback-re-register-fadump-from-userspace.patch
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
BuildRequires: asciidoc
BuildRequires: cmake
BuildRequires: gcc-c++
@ -133,6 +134,7 @@ after a crash dump has occured.
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%build
export CFLAGS="%{optflags}"