X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=sysstat.init;h=7f2e568a6d6ad8f725a36fe952f9613ac62dfebc;hb=e16590db433fd0682fa0484d50c074abdfddf4e8;hp=ec1d71383f608970e2c69289a8b46d4099a49287;hpb=76a8375a3f70bab67a0d54bbc84576e69f1621a4;p=packages%2Fsysstat.git

diff --git a/sysstat.init b/sysstat.init
index ec1d713..7f2e568 100644
--- a/sysstat.init
+++ b/sysstat.init
@@ -2,54 +2,80 @@
 #
 # sysstat	Sysstat system monitoring utility
 #
-# chkconfig:	2345 35 55
+# chkconfig:	2345 35 65
 #
-# description:	Sysstat system monitoring tools (sar,iostat,mpstat) \
+# description:	Sysstat system monitoring tools (sar,iostat,mpstat)
 #
+# $Id$
 
 # Source function library
 . /etc/rc.d/init.d/functions
 
+[ -f /etc/sysconfig/sysstat ] && . /etc/sysconfig/sysstat
 
-# 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_already_running "System Activity Data Collector"
+		return
+	fi
+
+	msg_starting "System Activity Data Collector"
+	daemon /usr/lib/sa/sadc $SADC_OPTIONS -
+	RETVAL=$?
+	[ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/sysstat
+}
+
+stop() {
 	if [ ! -f /var/lock/subsys/sysstat ]; then
-		msg_starting "system activity data collector"
-		daemon /usr/lib/sa/sadc
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/sysstat
-	else
-		msg_already_running "system activity data collector"
-		exit 1
+		msg_not_running "System Activity Data Collector"
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping "System Activity Data Collector"
+	ok
+	rm -f /var/lock/subsys/sysstat >/dev/null 2>&1
+}
+
+condrestart() {
+	if [ ! -f /var/lock/subsys/sysstat ]; then
+		msg_not_running "System Activity Data Collector"
+		RETVAL=$1
+		return
+	fi
+
+	stop
+	start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
 	;;
   stop)
-	if [ -f /var/lock/subsys/sysstat ]; then
-		# Stop daemons.
-		msg_stopping "system activity data collector"
-		echo
-		rm -f /var/lock/subsys/sysstat >/dev/null 2>&1
-	else
-		msg_not_running "system activity data collector"
-		exit 1
-	fi
+  	stop
 	;;
-  status)
-	status sysstat
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
 	;;
-  restart|reload)
-	$0 stop
-	$0 start
-	exit $?
   force-reload)
-	$0 stop && $0 start
+	condrestart 7
+	;;
+  status)
+	status sysstat
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
+	exit 3
+	;;
 esac
 
 exit $RETVAL