SOURCES: prelude-lml.init - updated (use functions, added try-restart)

[qboosh]

Author: qboosh                       Date: Wed Jul 16 21:03:08 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated (use functions, added try-restart)

---- Files affected:
SOURCES:
   prelude-lml.init (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/prelude-lml.init
diff -u SOURCES/prelude-lml.init:1.6 SOURCES/prelude-lml.init:1.7
--- SOURCES/prelude-lml.init:1.6	Fri Jan  5 19:02:52 2007
+++ SOURCES/prelude-lml.init	Wed Jul 16 23:03:03 2008
@@ -16,52 +16,66 @@
         exit 1
 fi
 
-
-case "$1" in
-    start)
-	    if [ ! -f /var/lock/subsys/prelude-lml ]; then
+start() {
+	if [ ! -f /var/lock/subsys/prelude-lml ]; then
 		msg_starting "Prelude LML"
 		daemon prelude-lml -d
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/prelude-lml
-	    else
+	else
 		msg_already_running "Prelude LML"
-	    fi
-	    ;;
+	fi
+}
 
-    stop)
-	    if [ -f /var/lock/subsys/prelude-lml ]; then
+stop() {
+	if [ -f /var/lock/subsys/prelude-lml ]; then
 		msg_stopping "Prelude LML"
 		killproc prelude-lml
 		rm -f /var/lock/subsys/prelude-lml
-	    fi
-	    ;;
+	fi
+}
 
-    restart)
-	    $0 stop
-	    $0 start
-	    exit $?
-	    ;;
+condrestart() {
+	if [ -f /var/lock/subsys/prelude-lml ]; then
+		stop
+		start
+	else
+		msg_not_running "Prelude LML"
+		RETVAL=$1
+	fi
+}
 
-    reload|force-reload)
-	    if [ -f /var/lock/subsys/prelude-lml ]; then
+RETVAL=0
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  reload|force-reload)
+	if [ -f /var/lock/subsys/prelude-lml ]; then
 		msg_reloading "Prelude LML"
 		killproc prelude-lml -HUP
 		RETVAL=$?
-	    else
+	else
 		msg_not_running prelude-lml >&2
 		exit 7
-	    fi
-	    ;;
-
-    status)
-	    status prelude-lml
-    ;;
-
-    *)
-    echo $"Usage: $0 {start|stop|restart|reload|force-reload|status}"
-    exit 1
-
+	fi
+	;;
+  status)
+	status prelude-lml
+	;;
+  *)
+	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
+	exit 1
 esac
 
 exit 0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/prelude-lml.init?r1=1.6&r2=1.7&f=u