Author: qboosh                       Date: Sat Dec 15 20:30:42 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- force-reload is not supposed to start service if not running
- added try-restart action (LSB 3.1)

---- Files affected:
SOURCES:
   gkrellmd.init (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/gkrellmd.init
diff -u SOURCES/gkrellmd.init:1.9 SOURCES/gkrellmd.init:1.10
--- SOURCES/gkrellmd.init:1.9   Thu Dec  8 02:02:49 2005
+++ SOURCES/gkrellmd.init       Sat Dec 15 21:30:36 2007
@@ -37,10 +37,7 @@
        exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        if [ ! -f /var/lock/subsys/gkrellmd ]; then
                msg_starting gkrellmd
                daemon gkrellmd $OPTIONS
@@ -49,8 +46,9 @@
        else
                msg_already_running gkrellmd
        fi
-        ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/gkrellmd ]; then
                msg_stopping gkrellmd
                killproc gkrellmd
@@ -58,18 +56,43 @@
        else
                msg_not_running gkrellmd
        fi
+}
+
+condrestart() {
+       if [ -f /var/lock/subsys/gkrellmd ]; then
+               stop
+               start
+       else
+               msg_not_running gkrellmd
+               RETVAL=$1
+       fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
         ;;
-  restart|force-reload)
-        $0 stop
-       $0 start
-       exit $?
+  stop)
+       stop
+        ;;
+  restart)
+        stop
+       start
         ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   status)
        status gkrellmd
        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/gkrellmd.init?r1=1.9&r2=1.10&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to