X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xdm.init;h=d3d32ef7b5fc14851c8fe5da2cdc05cdf7f6a71a;hb=750d57e00a5d17a7f2bc6d57b863011f7ec18034;hp=2325169dc789c5dfb0c5b8b0ced5d2ed775ef14b;hpb=2fc4a327e7f706a24503015eafba881ce651e05f;p=packages%2FX11.git

diff --git a/xdm.init b/xdm.init
index 2325169..d3d32ef 100644
--- a/xdm.init
+++ b/xdm.init
@@ -2,11 +2,11 @@
 #
 # 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
-#		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,37 +16,45 @@
 . /etc/rc.d/init.d/functions
 
 # Get service config
-if [ -f /etc/sysconfig/xdm ] ; then
-        . /etc/sysconfig/xdm
+if [ -f /etc/sysconfig/xdm ]; then
+	. /etc/sysconfig/xdm
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
 	# Check if the service is already running?
-	if [ -f /var/lock/subsys/xdm ]; then
-		echo "Starting X Display Manager already is running"
-	else
-		show Starting X Display Manager daemon
+	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"
 	fi
 	;;
   stop)
-	show Stopping X Display Manager daemon
-	killproc xdm
-	rm -f /var/lock/subsys/xdm
+	if [ -f /var/lock/subsys/xdm ]; then
+		msg_stopping "X Display Manager"
+		killproc xdm
+		rm -f /var/lock/subsys/xdm
+	else
+		msg_not_running "X Display Manager"
+	fi
 	;;
   status)
 	status xdm
+	exit $?
 	;;
-  restart|reload)
+  restart|force-reload)
 	$0 stop
 	$0 start
+	exit $?
 	;;
   *)
-	echo "Usage: $0 {start|stop|status|restart|reload}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	exit 3
 esac
 
-exit 0
+exit $RETVAL