rpms/kexec-tools/devel kdump.init, 1.16, 1.17 kexec-tools.spec, 1.93, 1.94

[Neil Horman (nhorman)]

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7183

Modified Files:
	kdump.init kexec-tools.spec 
Log Message:
Fixing xen kernel cmdline parsing


Index: kdump.init
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdump.init	5 Jul 2007 16:46:27 -0000	1.16
+++ kdump.init	10 Aug 2007 15:26:05 -0000	1.17
@@ -155,7 +155,13 @@
 		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"


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- kexec-tools.spec	1 Aug 2007 17:44:53 -0000	1.93
+++ kexec-tools.spec	10 Aug 2007 15:26:05 -0000	1.94
@@ -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 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Fri Aug 10 2007 Neil Horman <nhorman at redhat.com> - 1.101-78
+- Update init script to handle xen kernel cmdlnes (bz 250803)
+
 * Wed Aug 01 2007 Neil Horman <nhorman at redhat.com> - 1.101-77%{dist}
 - Update mkdumprd to suppres notifications /rev makedumpfile (bz 250341)