- up to 1.3.9

[packages/cups.git] / cups.init

diff --git a/cups.init b/cups.init
index 7a42be5074e9f5c72abadaf6ce2d65f8c83602f9..16693f16b3b8d99a45d077ebfd1bab2452f61413 100644 (file)
--- a/cups.init
+++ b/cups.init
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-#
 # cups         Common UNIX Printing System (CUPS)
 #
-# chkconfig:   235 99 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
@@ -33,55 +35,51 @@ case "$1" in
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
        else
-               msg_Already_Running CUPS
-               exit 1
+               msg_already_running CUPS
        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      
-        ;;
+               msg_not_running CUPS
+       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
+               msg_not_running CUPS
+               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