rpms/kexec-tools/F-7 kdump.init, 1.14, 1.15 kexec-tools.spec, 1.84, 1.85

[Neil Horman (nhorman)]

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24674

Modified Files:
	kdump.init kexec-tools.spec 
Log Message:
Resolves: bz 244649


Index: kdump.init
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-7/kdump.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kdump.init	11 Apr 2007 13:53:39 -0000	1.14
+++ kdump.init	18 Jun 2007 19:24:01 -0000	1.15
@@ -154,7 +154,7 @@
 		KDUMP_COMMANDLINE=`cat /proc/cmdline`
 	fi
 
-	MEM_RESERVED=`echo $KDUMP_COMMANDLINE | grep "crashkernel=[0-9]\+[MmKkGg]@[0-9]\+[MmGgKk]"`
+	MEM_RESERVED=`grep "crashkernel=[0-9]\+[MmKkGg]@[0-9]\+[MmGgKk]" /proc/cmdline`
 	if [ -z "$MEM_RESERVED" ]
 	then
 		$LOGGER "No crashkernel parameter specified for running kernel"


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-7/kexec-tools.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kexec-tools.spec	11 Apr 2007 13:53:39 -0000	1.84
+++ kexec-tools.spec	18 Jun 2007 19:24:01 -0000	1.85
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 69%{?dist}
+Release: 70%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -251,6 +251,9 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Mon Jun 18 2007 Neil Horman <nhorman at redhat.com> - 1.101-70%{dist}
+- Fixed kdump.init to read /proc/cmdline properly (bz 244649)
+
 * Wed Apr 11 2007 Neil Horman <nhorman at redhat.com> - 1.101-69%{dist}
 - Fixed up kdump.init to enforce mode 600 on authorized_keys2 (bz 235986)