- unify

Changed files:
    cups.init -> 1.25

diff --git a/cups.init b/cups.init
index 1c95c5aaf51317aecd91fd735ee63565d126ea80..0cfa5b2577d133213fa0bf9b6ec3c2cdfbe981f6 100644 (file)
--- a/cups.init
+++ b/cups.init
@@ -29,49 +29,56 @@ fi
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/cups ]; then
-               msg_starting CUPS
-               daemon /usr/sbin/cupsd -c /etc/cups/cupsd.conf
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
-       else
+       if [ -f /var/lock/subsys/cups ]; then
                msg_already_running CUPS
+               return
        fi
+
+       msg_starting CUPS
+       daemon /usr/sbin/cupsd -c /etc/cups/cupsd.conf
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
 }
 
 stop() {
        # Stop daemons.
-       if [ -f /var/lock/subsys/cups ]; then
-               msg_stopping CUPS
-               killproc cupsd
-               rm -f /var/lock/subsys/cups >/dev/null 2>&1
-       else
+       if [ ! -f /var/lock/subsys/cups ]; then
                msg_not_running CUPS
+               return
        fi
+
+       msg_stopping CUPS
+       killproc cupsd
+       rm -f /var/lock/subsys/cups >/dev/null 2>&1
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/cups ]; then
+               msg_not_running CUPS
+               RETVAL=7
+               return
+       fi
+
+       msg_reloading CUPS
+       killproc cupsd -HUP
+       RETVAL=$?
 }
 
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-       start
+       start
        ;;
   stop)
-       stop
+       stop
        ;;
   restart)
        stop
        start
        ;;
   reload|force-reload)
-       if [ -f /var/lock/subsys/cups ]; then
-               msg_reloading CUPS
-               killproc cupsd -HUP
-               RETVAL=$?
-       else
-               msg_not_running CUPS
-               exit 7
-       fi
+       reload
        ;;
   status)
        status cups cupsd