- use functions

- force-reload is not supposed to start service if not running
- added try-restart action (LSB 3.1)

Changed files:
    xdm.init -> 1.12

diff --git a/xdm.init b/xdm.init
index f5d52c6f870fbf0844d0777e0b8b5744812aefc3..bf9e8a60ec27232781d72f298de372a842d6219a 100644 (file)
--- a/xdm.init
+++ b/xdm.init
@@ -20,11 +20,7 @@ if [ -f /etc/sysconfig/xdm ]; then
        . /etc/sysconfig/xdm
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-       # Check if the service is already running?
+start() {
        if [ ! -f /var/lock/subsys/xdm ]; then
                msg_starting "X Display Manager"
                daemon xdm
@@ -33,8 +29,9 @@ case "$1" in
        else
                msg_already_running "X Display Manager"
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/xdm ]; then
                msg_stopping "X Display Manager"
                killproc xdm
@@ -42,18 +39,43 @@ case "$1" in
        else
                msg_not_running "X Display Manager"
        fi
+}
+
+condrestart() {
+       if [ -f /var/lock/subsys/xdm ]; then
+               stop
+               start
+       else
+               msg_not_running xdm
+               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 xdm
        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