X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=cups.init;h=16693f16b3b8d99a45d077ebfd1bab2452f61413;hb=fe15861e91a02b4ad8b3d0003548e1abe1549b40;hp=f53414feef2210649e6a034744025257d46a5772;hpb=17b43d0992ede9bb9b5b35b524b4711e12616383;p=packages%2Fcups.git

diff --git a/cups.init b/cups.init
index f53414f..16693f1 100644
--- a/cups.init
+++ b/cups.init
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-#
 # cups		Common UNIX Printing System (CUPS)
 #
-# chkconfig:	235 95 00
+# chkconfig:	2345 90 10
 # description:	Startup/shutdown script for the Common UNIX \
 #		Printing System (CUPS).
+# processname:	cupsd
 #
 
 # Source function library
@@ -18,14 +18,16 @@
 [ -f /etc/sysconfig/cups ] && . /etc/sysconfig/cups
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-	msg_network_down CUPS
-	exit 1
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		msg_network_down CUPS
+		exit 1
+	fi
+else
+	exit 0
 fi
 
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/cups ]; then
 		msg_starting CUPS
@@ -34,54 +36,50 @@ case "$1" in
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
 	else
 		msg_already_running CUPS
-		exit 1
 	fi
-        ;;
-  stop)
-        # Stop daemons.
+}
+
+stop() {
+	# Stop daemons.
 	if [ -f /var/lock/subsys/cups ]; then
 		msg_stopping CUPS
 		killproc cupsd
 		rm -f /var/lock/subsys/cups >/dev/null 2>&1
 	else
 		msg_not_running CUPS
-		exit 1
-	fi	
-        ;;
+	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
   restart)
-        $0 stop
-	$0 start
-        ;;
-  reload)
+	stop
+	start
+	;;
+  reload|force-reload)
 	if [ -f /var/lock/subsys/cups ]; then
-		msg_show CUPS
-		msg_reload
-		busy
+		msg_reloading CUPS
 		killproc cupsd -HUP
-		deltext
-		ok		
+		RETVAL=$?
 	else
 		msg_not_running CUPS
-		exit 1
+		exit 7
 	fi
 	;;
-  force-reload)
-  	# if program allows reloading without stopping
-	$0 reload
-	exit $?
-
-	# or if it doesn't
-	$0 stop && $0 start
-	exit $?
-	;;
   status)
-	status cups
+	status cups cupsd
 	exit $?
-        ;;
+	;;
   *)
-        # show "Usage: %s {start|stop|status|restart|reload|force-reload}" $0
-	msg_usage "$0 {start|stop|status|restart|reload|force-reload}"
-        exit 1
+	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	exit 3
 esac
 
 exit $RETVAL