- rel 3; branch diff fixes

[packages/cups.git] / cups.init

diff --git a/cups.init b/cups.init
index 60dada53340d8e1ce70ce6da731c06624346cfac..1c95c5aaf51317aecd91fd735ee63565d126ea80 100644 (file)
--- a/cups.init
+++ b/cups.init
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-#
 # cups         Common UNIX Printing System (CUPS)
 #
 # chkconfig:   2345 90 10
 # description: Startup/shutdown script for the Common UNIX \
 #              Printing System (CUPS).
+# processname: cupsd
 #
 
 # Source function library
@@ -27,21 +27,19 @@ else
        exit 0
 fi
 
-RETVAL=0
-# 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
+               daemon /usr/sbin/cupsd -c /etc/cups/cupsd.conf
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
        else
                msg_already_running CUPS
        fi
-       ;;
-  stop)
+}
+
+stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/cups ]; then
                msg_stopping CUPS
@@ -49,12 +47,21 @@ case "$1" in
                rm -f /var/lock/subsys/cups >/dev/null 2>&1
        else
                msg_not_running CUPS
-       fi      
+       fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
   reload|force-reload)
        if [ -f /var/lock/subsys/cups ]; then
@@ -62,16 +69,15 @@ case "$1" in
                killproc cupsd -HUP
                RETVAL=$?
        else
-               msg_not_running CUPS >&2
+               msg_not_running CUPS
                exit 7
        fi
        ;;
   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 3
 esac