- rel 2; add ipp14 backend; fixes for ipp15 backend; other fixes - everything from...

[packages/cups.git] / cups.init

diff --git a/cups.init b/cups.init
index 1660c3fb3f8b84abda7639546104b2d875086da8..0cfa5b2577d133213fa0bf9b6ec3c2cdfbe981f6 100644 (file)
--- 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
@@ -19,7 +19,7 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down CUPS
                exit 1
        fi
@@ -27,62 +27,66 @@ 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/cupsd ]; then
-               msg_starting CUPS
-               daemon cupsd -c /etc/cups/cupsd.conf
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cupsd
-       else
+       if [ -f /var/lock/subsys/cups ]; then
                msg_already_running CUPS
-               exit 1
+               return
        fi
-       ;;
-  stop)
+
+       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/cupsd ]; then
-               msg_stopping CUPS
-               killproc cupsd
-               rm -f /var/lock/subsys/cupsd >/dev/null 2>&1
-       else
+       if [ ! -f /var/lock/subsys/cups ]; then
                msg_not_running CUPS
-               exit 1
-       fi      
-       ;;
-  restart)
-       $0 stop
-       $0 start
-       ;;
-  reload)
-       if [ -f /var/lock/subsys/cupsd ]; then
-               msg_reloading CUPS
-               killproc cupsd -HUP
-               RETVAL=$?
-       else
+               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
-               exit 1
+               RETVAL=7
+               return
        fi
-       ;;
-  force-reload)
-       # if program allows reloading without stopping
-       $0 reload
-       exit $?
 
-       # or if it doesn't
-       $0 stop && $0 start
-       exit $?
+       msg_reloading CUPS
+       killproc cupsd -HUP
+       RETVAL=$?
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  reload|force-reload)
+       reload
        ;;
   status)
-       status cupsd
+       status cups cupsd
        exit $?
        ;;
   *)
-       # show "Usage: %s {start|stop|restart|reload|force-reload|status}"
        msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-       exit 1
+       exit 3
 esac
 
 exit $RETVAL