- updated to 4.3.99.12

[packages/XFree86.git] / xdm.init

diff --git a/xdm.init b/xdm.init
index 70c13283c9522349061f400aa3a4b4a25bb09aa3..e06b49e9b29438d5df128d2e5b83f46fc3bfa08b 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
@@ -15,33 +15,46 @@
 
 . /etc/rc.d/init.d/functions
 
+# Get service config
+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?
        if [ ! -f /var/lock/subsys/xdm ]; then
-               show Starting X Display Manager daemon
+               msg_starting "X Display Manager"
                daemon /usr/X11R6/bin/xdm
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xdm
        else
-               echo "Starting X Display Manager already is running"
+               msg_already_running "X Display Manager"
        fi
-       touch /var/lock/subsys/xdm
        ;;
   stop)
-       show Shutting down 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
+               rm -f /var/lock/subsys/xdm
+       else
+               msg_not_running "X Display Manager"
+       fi
        ;;
   status)
        status xdm
+       exit $?
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       echo "Usage: $0 {start|stop|status|restart|reload}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
-exit 0
-
+exit $RETVAL