Fixed squid init warning, now skipping start if running

diff --git a/config/rootfiles/updater/filelists/core16 b/config/rootfiles/updater/filelists/core16
index c1037315588243c0626f248686daa5379889ee7b..db546e505bb446092a33e28f86be8394f6b62e19 100644 (file)
--- a/config/rootfiles/updater/filelists/core16
+++ b/config/rootfiles/updater/filelists/core16
@@ -1,5 +1,6 @@
 opt/pakfire/db/core/mine
 etc/init.d/mISDN
+etc/init.d/squid
 etc/ppp/ip-up
 etc/modprobe.d/blacklist
 usr/bin/bc

diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index e1a49d28e231634bd992b74dd975267b709e2328..25fcac0c4eff2f77e286ecf03177a9532bdcb77f 100644 (file)
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -47,6 +47,14 @@ transparent() {
 
 case "$1" in
        start)
+               getpids "squid"
+
+               if [ -n "${pidlist}" ]; then
+                       echo -e "Squid is already running with Process"\
+                               "ID(s) ${pidlist}.${NORMAL}"
+               evaluate_retval
+               exit
+               fi
                if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then
                        boot_mesg "Starting Squid Proxy Server..."
                        loadproc /usr/sbin/squid -D -z >/dev/null 2>&1