- add try-restart, fix force-reload

Changed files:
    sysstat.init -> 1.12

diff --git a/sysstat.init b/sysstat.init
index f739dce2748c55a567f944cabdf08a06458ae262..f371c44302d2a801f8aa44e316b0c7cd3b7532bc 100644 (file)
--- a/sysstat.init
+++ b/sysstat.init
@@ -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 @@ case "$1" in
        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 @@ case "$1" in
        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