- up to 4.2

[packages/squid.git] / squid.init

diff --git a/squid.init b/squid.init
index 4d0b9f7e86077fdbcf516406f673d2a166222aa7..b09f17a2810312e40a256538ea8e1ef6e4cec825 100644 (file)
--- a/squid.init
+++ b/squid.init
@@ -76,7 +76,7 @@ start() {
        if [ ! -f /var/lock/subsys/squid ]; then
                check_cache_dirs
                msg_starting Squid
-               daemon squid $SQUID_OPTS
+               daemon /usr/sbin/squid $SQUID_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/squid
        else
@@ -114,10 +114,9 @@ stop() {
 }
 
 # check that squid config is ok
-# NOTE: needs running squid
 configtest() {
        show "Checking squid config syntax"
-       squid -k check >> /var/log/squid/squid.out 2>&1
+       squid -k parse >> /var/log/squid/squid.out 2>&1
        RETVAL=$?
        [ $RETVAL = 0 ] && ok || fail
 }
@@ -158,6 +157,7 @@ condrestart() {
                stop
                start
        else
+               msg_not_running Squid
                RETVAL=0
        fi
 }