- 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 f53414feef2210649e6a034744025257d46a5772..a4dec7ca2bcdd99b78b615b4ef56be3fac2a9b4b 100644 (file)
--- a/cups.init
+++ b/cups.init
@@ -27,11 +27,11 @@ 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/cupsd.conf
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cupsd
        else
                msg_already_running CUPS
                exit 1
@@ -39,10 +39,10 @@ case "$1" in
         ;;
   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
                exit 1
@@ -53,13 +53,10 @@ 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
                exit 1
@@ -75,7 +72,7 @@ case "$1" in
        exit $?
        ;;
   status)
-       status cups
+       status cupsd
        exit $?
         ;;
   *)