squid: Don't forcibly kill any redirectory processes

This is a race which might cause that when squidGuard pre-compiles any
data, it will be killed too. If that happens, squid will keep forking
squidGuard processes which will be unresponsive (because they are trying
to compile they own databases) and the whole system will become
unresponsive at some point.

There should be no need to perform this action.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/199/filelists/files b/config/rootfiles/core/199/filelists/files
index 369c39914cf8238db3c32a8ea88c9e9601dac0a6..d04204f4a67d301c58123d0bf1da6fecbd0eb005 100644 (file)
--- a/config/rootfiles/core/199/filelists/files
+++ b/config/rootfiles/core/199/filelists/files
@@ -3,6 +3,7 @@ etc/rc.d/init.d/messagebus
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/openvpn-n2n
 etc/rc.d/init.d/openvpn-rw
+etc/rc.d/init.d/squid
 etc/rc.d/init.d/wireguard
 etc/rc.d/rc0.d/K85messagebus
 etc/rc.d/rc3.d/S15messagebus

diff --git a/src/initscripts/system/squid b/src/initscripts/system/squid
index d457343342a8c84aa0b1f60e6106cb79b0168ac5..075f160c4b9db35b7f9edbfbbd7d2bb8b5e54ff6 100644 (file)
--- a/src/initscripts/system/squid
+++ b/src/initscripts/system/squid
@@ -149,13 +149,6 @@ case "$1" in
 
                                echo_ok
                        fi
-
-                       # Kill any redirector processes that might have been left running
-                       killproc /usr/bin/squidGuard >/dev/null &
-                       killproc /usr/sbin/updxlrator >/dev/null &
-                       killproc /usr/bin/squidclamav >/dev/null &
-                       killproc /usr/sbin/redirect_wrapper >/dev/null &
-                       wait
                fi
 
                # Trash remain pid file from squid.