- cleaning

Changed files:
    xdm.init -> 1.6
    xfs.init -> 1.9

diff --git a/xdm.init b/xdm.init
index 123d5eb6117c480b6fdf810d78d2c83de283ae36..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
-               msg_already_running "X Display Manager"
-       else
+       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)
-       msg_stopping "X Display Manager"
-       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 $?
        ;;
   *)
-       msg_usage "$0 {start|stop|status|restart|reload}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
        exit 1
 esac
 
-exit 0
+exit $RETVAL

diff --git a/xfs.init b/xfs.init
index de9d3b26bd2ce289504b498b68e6cafe059de576..19fbe58bcb759d23f9c7f05304c08a048602ccb9 100644 (file)
--- a/xfs.init
+++ b/xfs.init
@@ -2,7 +2,7 @@
 #
 # xfs:         Starts the X Font Server
 #
-# Version:      $Revision$
+# Version:     $Revision$
 #
 # chkconfig:   345 90 10
 # description: Starts and stops the X Font Server at boot time and shutdown.
@@ -16,9 +16,10 @@
 
 # Get service config
 if [ -f /etc/sysconfig/xfs ] ; then
-        . /etc/sysconfig/xfs
+       . /etc/sysconfig/xfs
 fi
 
+
 # See how we were called.
 case "$1" in
   start)
@@ -29,15 +30,23 @@ case "$1" in
                daemon xfs \
                        $([ -n "$XFS_PORT" ] && echo "-port $XFS_PORT") \
                        $([ -n "$XFS_OPTIONS" ] && echo "$XFS_OPTIONS")
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xfs
        else
                msg_already_running "X Font Server"
+               exit 1
        fi
-       touch /var/lock/subsys/xfs
        ;;
   stop)
-       msg_stopping "X Font Server"
-       killproc xfs
-       rm -f /var/lock/subsys/xfs
+       if [ -f /var/lock/subsys/xfs ]; then
+               msg_stopping "X Font Server"
+               killproc xfs
+               RETVAL=$?
+               rm -f /var/lock/subsys/xfs
+       else
+               msg_not_running "X Font Server"
+               exit 1
+       fi
        ;;
   status)
        status xfs
@@ -46,17 +55,19 @@ case "$1" in
        $0 stop
        $0 start
        ;;
-  reload)
+  reload|force-reload)
        if [ -f /var/lock/subsys/xfs ]; then
                msg_reloading "X Font Server"
                killproc xfs -USR1
+               RETVAL=$?
        else
                msg_not_running "X Font Server"
+               exit 1
        fi
        ;;
   *)
-       msg_usage "$0 {start|stop|status|restart|reload}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
        exit 1
 esac
 
-exit 0
+exit $RETVAL