SOURCES: sysstat.init - add try-restart, fix force-reload

[glen]

Author: glen                         Date: Tue Nov  4 20:45:57 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add try-restart, fix force-reload

---- Files affected:
SOURCES:
   sysstat.init (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/sysstat.init
diff -u SOURCES/sysstat.init:1.11 SOURCES/sysstat.init:1.12
--- SOURCES/sysstat.init:1.11	Thu Nov 10 14:11:20 2005
+++ SOURCES/sysstat.init	Tue Nov  4 21:45:51 2008
@@ -12,10 +12,7 @@
 
 [ -f /etc/sysconfig/sysstat ] && . /etc/sysconfig/sysstat
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/sysstat ]; then
 		msg_starting "system activity data collector"
@@ -25,8 +22,9 @@
 	else
 		msg_already_running "system activity data collector"
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/sysstat ]; then
 		# Stop daemons.
 		msg_stopping "system activity data collector"
@@ -35,18 +33,43 @@
 	else
 		msg_not_running "system activity data collector"
 	fi
+}
+
+condrestart() {
+	if [ -f /var/lock/subsys/sysstat ]; then
+		stop
+		start
+	else
+		msg_not_running "system activity data collector"
+		RETVAL=$1
+	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
 	;;
   status)
 	status sysstat
 	exit $?
 	;;
-  restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
-	;;
   *)
-	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 	;;
 esac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/sysstat.init?r1=1.11&r2=1.12&f=u