- added dos-backport patch (backport of cups-1.1.18-str75.patchv2 for 1.1.14)

[packages/cups.git] / cups.init

diff --git a/cups.init b/cups.init
index ecbbc7937982b47493f28a617d852e6b66eaebbe..a4dec7ca2bcdd99b78b615b4ef56be3fac2a9b4b 100644 (file)
--- a/cups.init
+++ b/cups.init
@@ -3,7 +3,7 @@
 #
 # cups         Common UNIX Printing System (CUPS)
 #
-# chkconfig:   0235 99 00
+# chkconfig:   235 95 00
 # description: Startup/shutdown script for the Common UNIX \
 #              Printing System (CUPS).
 #
@@ -19,7 +19,7 @@
 
 # Check that networking is up.
 if is_no "${NETWORKING}"; then
-       msg_Network_Down CUPS
+       msg_network_down CUPS
        exit 1
 fi
 
@@ -27,24 +27,24 @@ fi
 case "$1" in
   start)
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/cups ]; then
+       if [ ! -f /var/lock/subsys/cupsd ]; then
                msg_starting CUPS
-               daemon cupsd -c /etc/cups/cups.conf
+               daemon cupsd -c /etc/cups/cupsd.conf
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cupsd
        else
-               msg_Already_Running CUPS
+               msg_already_running CUPS
                exit 1
        fi
         ;;
   stop)
         # Stop daemons.
-       if [ -f /var/lock/subsys/cups ]; then
+       if [ -f /var/lock/subsys/cupsd ]; then
                msg_stopping CUPS
                killproc cupsd
-               rm -f /var/lock/subsys/cups >/dev/null 2>&1
+               rm -f /var/lock/subsys/cupsd >/dev/null 2>&1
        else
-               msg_Not_Running CUPS
+               msg_not_running CUPS
                exit 1
        fi      
         ;;
@@ -53,15 +53,12 @@ case "$1" in
        $0 start
         ;;
   reload)
-       if [ -f /var/lock/subsys/cups ]; then
-               msg_show CUPS
-               msg_reload
+       if [ -f /var/lock/subsys/cupsd ]; then
+               msg_reloading CUPS
                busy
                killproc cupsd -HUP
-               deltext
-               ok              
        else
-               msg_Not_Running CUPS
+               msg_not_running CUPS
                exit 1
        fi
        ;;
@@ -75,12 +72,12 @@ case "$1" in
        exit $?
        ;;
   status)
-       status cups
+       status cupsd
        exit $?
         ;;
   *)
         # show "Usage: %s {start|stop|status|restart|reload|force-reload}" $0
-       msg_Usage "$0 {start|stop|status|restart|reload|force-reload}"
+       msg_usage "$0 {start|stop|status|restart|reload|force-reload}"
         exit 1
 esac