- LSB conformance changes

Changed files:
    cups.init -> 1.13

diff --git a/cups.init b/cups.init
index 1660c3fb3f8b84abda7639546104b2d875086da8..a13f86a42136dc8da8cd76deadea546099360aac 100644 (file)
--- a/cups.init
+++ b/cups.init
@@ -27,6 +27,7 @@ else
        exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -38,7 +39,6 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cupsd
        else
                msg_already_running CUPS
-               exit 1
        fi
        ;;
   stop)
@@ -49,32 +49,23 @@ case "$1" in
                rm -f /var/lock/subsys/cupsd >/dev/null 2>&1
        else
                msg_not_running CUPS
-               exit 1
        fi      
        ;;
   restart)
        $0 stop
        $0 start
+       exit $?
        ;;
-  reload)
+  reload|force-reload)
        if [ -f /var/lock/subsys/cupsd ]; then
                msg_reloading CUPS
                killproc cupsd -HUP
                RETVAL=$?
        else
-               msg_not_running CUPS
-               exit 1
+               msg_not_running CUPS >&2
+               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
        exit $?
@@ -82,7 +73,7 @@ case "$1" in
   *)
        # 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