- cleanup

[packages/X11.git] / xfs.init

diff --git a/xfs.init b/xfs.init
index 19fbe58bcb759d23f9c7f05304c08a048602ccb9..0f7e499674a6db0c0f9b6e63fd0b13fa70430165 100644 (file)
--- a/xfs.init
+++ b/xfs.init
@@ -15,15 +15,11 @@
 . /etc/rc.d/init.d/functions
 
 # Get service config
-if [ -f /etc/sysconfig/xfs ] ; then
+if [ -f /etc/sysconfig/xfs ]; then
        . /etc/sysconfig/xfs
 fi
 
-
-# See how we were called.
-case "$1" in
-  start)
-       # Check if the service is already running?
+start() {
        if [ ! -f /var/lock/subsys/xfs ]; then
                msg_starting "X Font Server"
                rm -fr /tmp/.font-unix
@@ -34,40 +30,66 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xfs
        else
                msg_already_running "X Font Server"
-               exit 1
        fi
-       ;;
-  stop)
+}
+
+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
-       ;;
-  restart)
-       $0 stop
-       $0 start
-       ;;
-  reload|force-reload)
+}
+
+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
+               RETVAL=7
+       fi
+}
+
+condrestart() {
+       if [ -f /var/lock/subsys/xfs ]; then
+               stop
+               start
+       else
+               msg_not_running xfs
+               RETVAL=$1
        fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
+       ;;
+  reload|force-reload)
+       reload
+       ;;
+  status)
+       status xfs
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL