- rel 3; branch diff fixes

[packages/cups.git] / cups.init

diff --git a/cups.init b/cups.init
index 03e0849345f7da10faaf66cd9186f54aee0688b2..1c95c5aaf51317aecd91fd735ee63565d126ea80 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,64 +27,59 @@ 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
+       if [ ! -f /var/lock/subsys/cups ]; then
                msg_starting CUPS
-               daemon cupsd -c /etc/cups/cupsd.conf
+               daemon /usr/sbin/cupsd -c /etc/cups/cupsd.conf
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cupsd
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
        else
                msg_already_running CUPS
-               exit 1
        fi
-       ;;
-  stop)
+}
+
+stop() {
        # Stop daemons.
-       if [ -f /var/lock/subsys/cupsd ]; then
+       if [ -f /var/lock/subsys/cups ]; then
                msg_stopping CUPS
                killproc cupsd
-               rm -f /var/lock/subsys/cupsd >/dev/null 2>&1
+               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
+       stop
+       start
        ;;
-  reload)
-       if [ -f /var/lock/subsys/cupsd ]; then
+  reload|force-reload)
+       if [ -f /var/lock/subsys/cups ]; then
                msg_reloading CUPS
-               busy
                killproc cupsd -HUP
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && ok || died
        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 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