rpms/kexec-tools/devel kdump.init, 1.2, 1.3 kdump.sysconfig, 1.1, 1.2 kexec-tools.spec, 1.9, 1.10

[fedora-cvs-commits at redhat.com]

Author: jmoyer

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23336

Modified Files:
	kdump.init kdump.sysconfig kexec-tools.spec 
Log Message:
- Fix the service stop case.  It was previously unloading the wrong kernel.
- Implement the "restart" function.
- Add the "irqpoll" option as a default kdump kernel commandline parameter.
- Create a default kernel command line in the sysconfig file upon rpm install.




Index: kdump.init
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdump.init	22 Nov 2005 21:52:53 -0000	1.2
+++ kdump.init	17 Feb 2006 23:58:33 -0000	1.3
@@ -75,6 +75,7 @@
 	if [ -z "$KDUMP_COMMANDLINE" ]; then
 		KDUMP_COMMANDLINE=`cat /proc/cmdline`
 		KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'`
+		KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} irqpoll"
 	fi
 
 	$KEXEC $KEXEC_ARGS $standard_kexec_args $KEXEC_HEADERS \
@@ -92,13 +93,14 @@
 	fi
 	;;
   stop)
-	$KEXEC -u
+	$KEXEC -u -p
 	;;
   status)
 	echo "not implemented"
 	;;
   restart)
-	echo "not implemented"
+	$KEXEC -u -p
+	load_kdump
 	;;
   condrestart)
 	;;


Index: kdump.sysconfig
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdump.sysconfig	23 Sep 2005 21:04:31 -0000	1.1
+++ kdump.sysconfig	17 Feb 2006 23:58:33 -0000	1.2
@@ -9,7 +9,7 @@
 #   KDUMP_COMMANDLINE="ro root=LABEL=/"
 # If a command line is not specified, the default will be taken from
 # /proc/cmdline
-KDUMP_COMMANDLINE=""
+KDUMP_COMMANDLINE="REPLACEME"
 
 # Any additional kexec arguments required.  In most situations, this should
 # be left empty


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kexec-tools.spec	7 Feb 2006 12:26:54 -0000	1.9
+++ kexec-tools.spec	17 Feb 2006 23:58:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 7.1.1
+Release: 8
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -64,6 +64,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+KDUMP_COMMANDLINE=`cat /proc/cmdline`
+KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'`
+export KDUMP_COMMANDLINE
+sed -i -e "s|REPLACEME|$KDUMP_COMMANDLINE irqpoll|g" /etc/sysconfig/kdump
 chkconfig --add kdump
 
 %postun
@@ -92,6 +96,12 @@
 %doc TODO
 
 %changelog
+* Fri Feb 17 2006 Jeff Moyer <jmoyer at redhat.com> - 1.101-8
+- Fix the service stop case.  It was previously unloading the wrong kernel.
+- Implement the "restart" function.
+- Add the "irqpoll" option as a default kdump kernel commandline parameter.
+- Create a default kernel command line in the sysconfig file upon rpm install.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.101-7.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes