- LSB conformance

Changed files:
    xdm.init -> 1.7
    xfs.init -> 1.10

diff --git a/xdm.init b/xdm.init
index a295dc379e363605386cfdd4e0f62c512195bbb8..8be594e9596304413dafb4c1b912880f45eca4f1 100644 (file)
--- a/xdm.init
+++ b/xdm.init
@@ -20,7 +20,7 @@ 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

diff --git a/xfs.init b/xfs.init
index 19fbe58bcb759d23f9c7f05304c08a048602ccb9..8e5af30901d32e6e64010954752331ff2a2a0f7c 100644 (file)
--- a/xfs.init
+++ b/xfs.init
@@ -19,7 +19,7 @@ if [ -f /etc/sysconfig/xfs ] ; then
        . /etc/sysconfig/xfs
 fi
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -34,26 +34,25 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xfs
        else
                msg_already_running "X Font Server"
-               exit 1
        fi
        ;;
   stop)
        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
+       exit $?
        ;;
   restart)
        $0 stop
        $0 start
+       exit $?
        ;;
   reload|force-reload)
        if [ -f /var/lock/subsys/xfs ]; then
@@ -61,13 +60,13 @@ case "$1" in
                killproc xfs -USR1
                RETVAL=$?
        else
-               msg_not_running "X Font Server"
-               exit 1
+               msg_not_running "X Font Server" >&2
+               exit 7
        fi
        ;;
   *)
        msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-       exit 1
+       exit 3
 esac
 
 exit $RETVAL