From 1d0759917d63ddd759f72e35517f9ed709092f05 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 10 Aug 2007 15:26:05 +0000 Subject: [PATCH] Fixing xen kernel cmdline parsing --- kdump.init | 8 +++++++- kexec-tools.spec | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/kdump.init b/kdump.init index bd99d03..bfef2dd 100644 --- a/kdump.init +++ b/kdump.init @@ -155,7 +155,13 @@ function load_kdump() KDUMP_COMMANDLINE=`cat /proc/cmdline` fi - MEM_RESERVED=`grep "crashkernel=[0-9]\+[MmKkGg]@[0-9]\+[MmGgKk]" /proc/cmdline` + if [ "$ARCH" == "ppc64" ] + then + MEM_RESERVED=`grep "crashkernel=[0-9]\+[MmKkGg]@[0-9]\+[MmGgKk]" /proc/cmdline` + else + MEM_RESERVED=`grep "Crash kernel" /proc/iomem | grep -v "00000000-00000000"` + fi + if [ -z "$MEM_RESERVED" ] then $LOGGER "No crashkernel parameter specified for running kernel" diff --git a/kexec-tools.spec b/kexec-tools.spec index 94b105a..f82d7a0 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 77%{?dist} +Release: 78%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -252,6 +252,9 @@ rm -f %{_datadir}/firstboot/modules/firstboot_kdump.py %doc kexec-kdump-howto.txt %changelog +* Fri Aug 10 2007 Neil Horman - 1.101-78 +- Update init script to handle xen kernel cmdlnes (bz 250803) + * Wed Aug 01 2007 Neil Horman - 1.101-77%{dist} - Update mkdumprd to suppres notifications /rev makedumpfile (bz 250341)