- wait for squid processes to stop instead of sleeping 30 secs

Changed files:
    squid.init -> 1.35

diff --git a/squid.init b/squid.init
index f59d5f393df3aefc4d2e833aa5e0b676d6cb5db5..5ac668d61033616e7e8d029cbbc5e456d21a7c04 100644 (file)
--- a/squid.init
+++ b/squid.init
@@ -38,9 +38,6 @@
 # Get network config
 . /etc/sysconfig/network
 
-# initial value:
-DELAY_IN_RESTART=30
-
 # Get service config
 [ -f /etc/sysconfig/squid ] && . /etc/sysconfig/squid
 
@@ -75,15 +72,32 @@ case "$1" in
        if [ -f /var/lock/subsys/squid ]; then
                # Stop daemons.
                msg_stopping Squid
+               if [ -f /var/run/httpd.pid ]; then
+                       PID=$(filter_chroot `cat /var/log/squid/squid.pid`)
+                       if [ -z "$PID" ]; then
+                               PID=0
+                       fi
+               else
+                       PID=0
+               fi
                killproc squid
                RETVAL=$?
+               if [ ! $PID -eq 0 ]; then
+                       show "Waiting for Squid to stop"
+                       busy
+                       while ps -U squid -o user | grep -q ^squid
+                       do
+                               sleep 1
+                       done
+                       ok
+               fi
                rm -f /var/lock/subsys/squid >/dev/null 2>&1
        else
                msg_not_running Squid
        fi
        ;;
   restart)
-       $0 stop && nls -n "Waiting %s seconds..." "$DELAY_IN_RESTART" && sleep $DELAY_IN_RESTART && nls "done."
+       $0 stop
        $0 start
        exit $?
        ;;