aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@G5.local>2009-10-26 19:37:21 -0400
committerScott Ullrich <sullrich@G5.local>2009-10-26 19:37:21 -0400
commit7154042af6e4d9aa8e3e26c3aba0bbbd6e7cb4cf (patch)
tree9e6741bb307f83911502a650c5b982535eac83e5
parent1e3d6494907cf667295311e3fe6d58838489a897 (diff)
downloadpfsense-packages-7154042af6e4d9aa8e3e26c3aba0bbbd6e7cb4cf.tar.gz
pfsense-packages-7154042af6e4d9aa8e3e26c3aba0bbbd6e7cb4cf.tar.bz2
pfsense-packages-7154042af6e4d9aa8e3e26c3aba0bbbd6e7cb4cf.zip
Check for swap.state instead
-rw-r--r--config/squid/squid.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 3063e78b..f4c16925 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -257,8 +257,8 @@ function squid_deinstall_command() {
$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/log');
mwexec('rm -rf $cachedir');
mwexec('rm -rf $logdir');
- if(isdir("/var/squid/cache"))
- mwexec("rm -rf /var/squid/cache");
+ if(is_file("/var/squid/swap.state"))
+ mwexec("rm -rf /var/squid/cache/swap.state");
mwexec('rm -f /usr/local/etc/rc.d/proxy_monitor.sh');
mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill");
mwexec("ps awux | grep \"squid\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");