X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=cups.init;h=0cfa5b2577d133213fa0bf9b6ec3c2cdfbe981f6;hb=32548b835b3b8f624b71eba3bae3cfa9095991c9;hp=87a5e5083c76ef20a5773a3c3a9effa559307c60;hpb=78986dfaf94c67376689bf808444d92e3796e410;p=packages%2Fcups.git

diff --git a/cups.init b/cups.init
index 87a5e50..0cfa5b2 100644
--- a/cups.init
+++ b/cups.init
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-#
 # cups		Common UNIX Printing System (CUPS)
 #
-# chkconfig:	0235 99 00
+# chkconfig:	2345 90 10
 # description:	Startup/shutdown script for the Common UNIX \
 #		Printing System (CUPS).
+# processname:	cupsd
 #
 
 # Source function library
@@ -18,70 +18,75 @@
 [ -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_already_running CUPS
+		return
+	fi
+
+	msg_starting CUPS
+	daemon /usr/sbin/cupsd -c /etc/cups/cupsd.conf
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
+}
+
+stop() {
+	# Stop daemons.
 	if [ ! -f /var/lock/subsys/cups ]; then
-		msg_starting CUPS
-		daemon cupsd -c /etc/cups/cupsd.conf
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
-	else
-		msg_Already_Running CUPS
-		exit 1
+		msg_not_running CUPS
+		return
+	fi
+
+	msg_stopping CUPS
+	killproc cupsd
+	rm -f /var/lock/subsys/cups >/dev/null 2>&1
+}
+
+reload() {
+	if [ ! -f /var/lock/subsys/cups ]; then
+		msg_not_running CUPS
+		RETVAL=7
+		return
 	fi
-        ;;
+
+	msg_reloading CUPS
+	killproc cupsd -HUP
+	RETVAL=$?
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
   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	
-        ;;
+	stop
+	;;
   restart)
-        $0 stop
-	$0 start
-        ;;
-  reload)
-	if [ -f /var/lock/subsys/cups ]; then
-		msg_show CUPS
-		msg_reload
-		busy
-		killproc cupsd -HUP
-		deltext
-		ok		
-	else
-		msg_Not_Running CUPS
-		exit 1
-	fi
+	stop
+	start
 	;;
-  force-reload)
-  	# if program allows reloading without stopping
-	$0 reload
-	exit $?
-
-	# or if it doesn't
-	$0 stop && $0 start
-	exit $?
+  reload|force-reload)
+	reload
 	;;
   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