This commit was manufactured by cvs2git to create branch 'RA-branch'.

[packages/cups.git] / cups.init

diff --git a/cups.init b/cups.init
index a13f86a42136dc8da8cd76deadea546099360aac..a4dec7ca2bcdd99b78b615b4ef56be3fac2a9b4b 100644 (file)
--- a/cups.init
+++ b/cups.init
@@ -18,16 +18,11 @@
 [ -f /etc/sysconfig/cups ] && . /etc/sysconfig/cups
 
 # Check that networking is up.
-if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
-               msg_network_down CUPS
-               exit 1
-       fi
-else
-       exit 0
+if is_no "${NETWORKING}"; then
+       msg_network_down CUPS
+       exit 1
 fi
 
-RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -39,41 +34,51 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cupsd
        else
                msg_already_running CUPS
+               exit 1
        fi
-       ;;
+        ;;
   stop)
-       # Stop daemons.
+        # Stop daemons.
        if [ -f /var/lock/subsys/cupsd ]; then
                msg_stopping CUPS
                killproc cupsd
                rm -f /var/lock/subsys/cupsd >/dev/null 2>&1
        else
                msg_not_running CUPS
+               exit 1
        fi      
-       ;;
+        ;;
   restart)
-       $0 stop
+        $0 stop
        $0 start
-       exit $?
-       ;;
-  reload|force-reload)
+        ;;
+  reload)
        if [ -f /var/lock/subsys/cupsd ]; then
                msg_reloading CUPS
+               busy
                killproc cupsd -HUP
-               RETVAL=$?
        else
-               msg_not_running CUPS >&2
-               exit 7
+               msg_not_running CUPS
+               exit 1
        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
        exit $?
-       ;;
+        ;;
   *)
-       # show "Usage: %s {start|stop|restart|reload|force-reload|status}"
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-       exit 3
+        # show "Usage: %s {start|stop|status|restart|reload|force-reload}" $0
+       msg_usage "$0 {start|stop|status|restart|reload|force-reload}"
+        exit 1
 esac
 
 exit $RETVAL