X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xfs.init;h=2b98bbefa18a3f9430ccf6caa538197c2fcd99f8;hb=43876024d3b6fbb9f375e4ba5ff3a11c9e4d5590;hp=19fbe58bcb759d23f9c7f05304c08a048602ccb9;hpb=4f40a6c78a472badc2eb271af0135a156ca64402;p=packages%2FXFree86.git

diff --git a/xfs.init b/xfs.init
index 19fbe58..2b98bbe 100644
--- a/xfs.init
+++ b/xfs.init
@@ -15,11 +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
 
-
+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