aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal Luçi <ermal.luci@gmail.com>2012-08-01 23:43:09 -0700
committerErmal Luçi <ermal.luci@gmail.com>2012-08-01 23:43:09 -0700
commit88358a3ff3f9e182db246e6abdd168669a26bdd5 (patch)
treebe3afb30cc07ae36d6ed5b10e2ce7ec6a5200c21
parent403c86afec3b7745a80e94437ba0187847a792dd (diff)
parentfc0e44e716ef809ccc787a9d885901025bfebf8f (diff)
downloadpfsense-packages-88358a3ff3f9e182db246e6abdd168669a26bdd5.tar.gz
pfsense-packages-88358a3ff3f9e182db246e6abdd168669a26bdd5.tar.bz2
pfsense-packages-88358a3ff3f9e182db246e6abdd168669a26bdd5.zip
Merge pull request #308 from phil-davis/master
Make matching conf_mount_ro calls during squid3 installation
-rw-r--r--config/squid-reverse/squid.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index e00da80c..d8b71a58 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -1465,8 +1465,8 @@ function squid_resync() {
sleep(1);
}
filter_configure();
- conf_mount_ro();
}
+ conf_mount_ro();
}
function squid_print_javascript_auth() {
@@ -1796,6 +1796,7 @@ if [ -z "`ps auxw | grep "[s]quid "|awk '{print $2}'`" ];then
EOD;
conf_mount_rw();
write_rcfile($rc);
+ conf_mount_ro();
}
/* Uses XMLRPC to synchronize the changes to a remote node */