- fix for https://bugs.freedesktop.org/attachment.cgi?id=5478

[packages/X11.git] / xdm.init

diff --git a/xdm.init b/xdm.init
index a295dc379e363605386cfdd4e0f62c512195bbb8..d3d32ef7b5fc14851c8fe5da2cdc05cdf7f6a71a 100644 (file)
--- a/xdm.init
+++ b/xdm.init
@@ -4,9 +4,9 @@
 #
 # Version:     @(#) /etc/rc.d/init.d/xdm 1.3
 #
-# chkconfig:   5 95 5
-# description: Starts and stops the X Display Manager at startup and
-#              shutdown. can run one of several display managers; gdm, kdm,
+# chkconfig:   5 95 05
+# description: Starts and stops the X Display Manager at startup and \
+#              shutdown. can run one of several display managers; gdm, kdm, \
 #              or xdm, in that order of preferential treatment.
 #
 # config:      /etc/X11/xdm/xdm-config
@@ -16,11 +16,11 @@
 . /etc/rc.d/init.d/functions
 
 # Get service config
-if [ -f /etc/sysconfig/xdm ] ; then
+if [ -f /etc/sysconfig/xdm ]; then
        . /etc/sysconfig/xdm
 fi
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -28,38 +28,33 @@ case "$1" in
        if [ ! -f /var/lock/subsys/xdm ]; then
                msg_starting "X Display Manager"
                daemon /usr/X11R6/bin/xdm
-               touch /var/lock/subsys/xdm
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xdm
        else
                msg_already_running "X Display Manager"
-               exit 1
        fi
        ;;
   stop)
        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
+       exit $?
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
        exit $?
        ;;
-  force-reload)
-       $0 stop && $0 start
-       exit $?
-       ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL