From 8b2027902ef49a7a8c0bbcb931d5e2251bdb61bd Mon Sep 17 00:00:00 2001
From: Maniacikarus <maniacikarus.ipfire.org>
Date: Wed, 30 Jul 2008 20:44:06 +0200
Subject: [PATCH] Fixed squid init warning, now skipping start if running

---
 config/rootfiles/updater/filelists/core16 | 1 +
 src/initscripts/init.d/squid              | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/config/rootfiles/updater/filelists/core16 b/config/rootfiles/updater/filelists/core16
index c103731558..db546e505b 100644
--- 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 e1a49d28e2..25fcac0c4e 100644
--- 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
-- 
2.39.2