rpms/kexec-tools/devel kdump.init, 1.9, 1.10 kexec-tools.spec, 1.52, 1.53

[fedora-cvs-commits at redhat.com]

Author: nhorman

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

Modified Files:
	kdump.init kexec-tools.spec 
Log Message:
fixing bz 202598


Index: kdump.init
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdump.init	27 Jul 2006 13:08:21 -0000	1.9
+++ kdump.init	15 Aug 2006 15:16:07 -0000	1.10
@@ -58,12 +58,12 @@
 
 	if [ ! -f $kdump_kernel ]; then
 		echo -n "No kdump kernel image found."; warning; echo
-		echo -n "Tried to locate ${kdump_kernel}"
+		echo "Tried to locate ${kdump_kernel}"
 		exit 0
 	fi
 
 	if [ ! -f $kdump_initrd ]; then
-		echo "No kdump initial ramdisk found."
+		echo  -n "No kdump initial ramdisk found."; warning; echo
 		echo "Tried to locate ${kdump_initrd}"
 		return 1
 	fi
@@ -109,6 +109,11 @@
 	$KEXEC $KEXEC_ARGS $standard_kexec_args \
 		--command-line="$KDUMP_COMMANDLINE" \
 		--initrd=$kdump_initrd $kdump_kernel
+
+	if [ $? == 0 ]; then
+		touch /var/run/kdump.status
+	fi
+
 }
 
 case "$1" in
@@ -124,12 +129,18 @@
 	;;
   stop)
 	$KEXEC -p -u
+	rm -f /var/run/kdump.status
 	;;
   status)
-	echo "not implemented"
+	if [ -a /var/run/kdump.status ]; then
+		echo "Kdump is operational"
+	else
+		echo "Kdump is not operational"
+	fi 
 	;;
   restart)
 	$KEXEC -p -u
+	rm -f /var/run/kdump.status
 	check_config
 	load_kdump
 	;;


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kexec-tools.spec	10 Aug 2006 01:51:08 -0000	1.52
+++ kexec-tools.spec	15 Aug 2006 15:16:07 -0000	1.53
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 43%{dist}
+Release: 44%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -143,6 +143,9 @@
 %doc TODO
 
 %changelog
+* Tue Aug 15 2006 Neil Horman <nhorman at redhat.com> - 1.101-44%{dist}
+- updated init script to implement status function/scrub err messages
+ 
 * Wed Aug 09 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-43%{dist}
 - Misc spec cleanups and macro-ifications