From faf39f50bf82af08ada1a957fd4e2a8610cab1b4 Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Thu, 3 Apr 2014 14:31:25 -0300
Subject: squid3-dev include info to check diskd process with ipcs and ipcrm
 https://forum.pfsense.org/index.php?topic=74317.0 Thanks to bellera

---
 config/squid3/33/squid.inc       | 6 ++++++
 config/squid3/33/squid_cache.xml | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc
index 75806a00..e6312d91 100755
--- a/config/squid3/33/squid.inc
+++ b/config/squid3/33/squid.inc
@@ -2271,6 +2271,12 @@ EOD;
 {$squid_local_base}/sbin/squid -k shutdown -f {$squid_conffile_var}
 # Just to be sure...
 sleep 5
+		
+if [ -f /usr/bin/ipcs ];then
+# http://man.chinaunix.net/newsoft/squid/Squid_FAQ/FAQ-22.html#ss22.8
+ipcs | grep '^[mq]' | awk '{printf "ipcrm -%s %s\\n", $1, $2}' | /bin/sh
+fi
+		
 killall -9 squid 2>/dev/null
 killall pinger 2>/dev/null
 
diff --git a/config/squid3/33/squid_cache.xml b/config/squid3/33/squid_cache.xml
index 26d6463c..a1682eaa 100755
--- a/config/squid3/33/squid_cache.xml
+++ b/config/squid3/33/squid_cache.xml
@@ -166,7 +166,11 @@
 		<field>
 			<fielddescr>Hard disk cache system</fielddescr>
 			<fieldname>harddisk_cache_system</fieldname>
-			<description>This specifies the kind of storage system to use. &lt;p&gt; &lt;b&gt; ufs &lt;/b&gt; is the old well-known Squid storage format that has always been there. &lt;p&gt; &lt;b&gt; aufs &lt;/b&gt; uses POSIX-threads to avoid blocking the main Squid process on disk-I/O. (Formerly known as async-io.) &lt;p&gt; &lt;b&gt; diskd &lt;/b&gt; uses a separate process to avoid blocking the main Squid process on disk-I/O. &lt;p&gt; &lt;b&gt; null &lt;/b&gt; Does not use any storage. Ideal for Embedded/NanoBSD.</description>
+			<description><![CDATA[This specifies the kind of storage system to use.
+						<br><br><b>ufs</b> is the old well-known Squid storage format that has always been there.
+			 			<br><br><b>aufs</b> uses POSIX-threads to avoid blocking the main Squid process on disk-I/O. (Formerly known as async-io.)
+			 			<br><br><b>diskd</b> uses a separate process to avoid blocking the main Squid process on disk-I/O.<br>To use <b>ipcs</b> and <b>ipcrm</b> on squid, Download livefs.iso from ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/8.3/ mount it and copy <b>/usr/bin/ipcs</b> and <b>/usr/bin/ipcrm</b> to your system and set them as executables.
+			 			<br><br><b>null</b> Does not use any storage. Ideal for Embedded/NanoBSD.]]></description>
 			<type>select</type>
 			<default_value>ufs</default_value>
 			<options>
-- 
cgit v1.2.3