- rel 2; force pam.d config overwrite

[packages/cups.git] / cups.init

diff --git a/cups.init b/cups.init
index f53414feef2210649e6a034744025257d46a5772..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
@@ -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_starting CUPS
-               daemon cupsd -c /etc/cups/cupsd.conf
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
-       else
+       if [ -f /var/lock/subsys/cups ]; then
                msg_already_running CUPS
-               exit 1
+               return
        fi
-        ;;
-  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_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_not_running CUPS
-               exit 1
-       fi      
-        ;;
-  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
+               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 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