Change squid init script to kill remaining clamav redirectors.

diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files
index d4ff5e242c6a191b19f79399d10083452616611d..8a642aa7ec44d0579bec7e961e5873dc75011310 100644 (file)
--- a/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@ -1,2 +1,3 @@
 etc/system-release
 etc/system-release

+etc/init.d/squid

 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi

diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index 75dbbfa6bb5c6e2ca69ff5b5a4403d60813d01cd..1a1425d0c695f1b2a4628b1100006f9b5d708826 100644 (file)
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -88,6 +88,7 @@ case "$1" in
                        evaluate_retval
                        killproc /usr/bin/squidGuard >/dev/null
                        killproc /usr/sbin/updxlrator >/dev/null
                        evaluate_retval
                        killproc /usr/bin/squidGuard >/dev/null
                        killproc /usr/sbin/updxlrator >/dev/null

+                       killproc /usr/bin/squidclamav >/dev/null

                        killproc /usr/sbin/squid >/dev/null
                        rm -rf /var/run/squid.pid       
                fi
                        killproc /usr/sbin/squid >/dev/null
                        rm -rf /var/run/squid.pid       
                fi