This commit was manufactured by cvs2git to create branch 'RA-branch'.

[packages/X11.git] / xdm.init

diff --git a/xdm.init b/xdm.init
index 2325169dc789c5dfb0c5b8b0ced5d2ed775ef14b..a295dc379e363605386cfdd4e0f62c512195bbb8 100644 (file)
--- a/xdm.init
+++ b/xdm.init
@@ -2,7 +2,7 @@
 #
 # xdm:         Starts the X Display Manager
 #
-# Version:      @(#) /etc/rc.d/init.d/xdm 1.3
+# Version:     @(#) /etc/rc.d/init.d/xdm 1.3
 #
 # chkconfig:   5 95 5
 # description: Starts and stops the X Display Manager at startup and
@@ -17,25 +17,33 @@
 
 # Get service config
 if [ -f /etc/sysconfig/xdm ] ; then
-        . /etc/sysconfig/xdm
+       . /etc/sysconfig/xdm
 fi
 
+
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-       if [ -f /var/lock/subsys/xdm ]; then
-               echo "Starting X Display Manager already is running"
-       else
-               show Starting X Display Manager daemon
+       if [ ! -f /var/lock/subsys/xdm ]; then
+               msg_starting "X Display Manager"
                daemon /usr/X11R6/bin/xdm
                touch /var/lock/subsys/xdm
+       else
+               msg_already_running "X Display Manager"
+               exit 1
        fi
        ;;
   stop)
-       show Stopping X Display Manager daemon
-       killproc xdm
-       rm -f /var/lock/subsys/xdm
+       if [ -f /var/lock/subsys/xdm ]; then
+               msg_stopping "X Display Manager"
+               killproc xdm
+               RETVAL=$?
+               rm -f /var/lock/subsys/xdm
+       else
+               msg_not_running "X Display Manager"
+               exit 1
+       fi
        ;;
   status)
        status xdm
@@ -43,10 +51,15 @@ case "$1" in
   restart|reload)
        $0 stop
        $0 start
+       exit $?
+       ;;
+  force-reload)
+       $0 stop && $0 start
+       exit $?
        ;;
   *)
-       echo "Usage: $0 {start|stop|status|restart|reload}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
        exit 1
 esac
 
-exit 0
+exit $RETVAL