diff options
author | Phil Davis <phil.davis@world.inf.org> | 2012-08-02 08:23:53 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@world.inf.org> | 2012-08-02 08:23:53 +0545 |
commit | fc0e44e716ef809ccc787a9d885901025bfebf8f (patch) | |
tree | 0d727178e369838df263b84307c6bf3dd4c6a091 | |
parent | 1156fc0a39a8cecc1867f9c88f836697860de030 (diff) | |
download | pfsense-packages-fc0e44e716ef809ccc787a9d885901025bfebf8f.tar.gz pfsense-packages-fc0e44e716ef809ccc787a9d885901025bfebf8f.tar.bz2 pfsense-packages-fc0e44e716ef809ccc787a9d885901025bfebf8f.zip |
Make matching conf_mount_ro calls for squid
After initial installation of squid3 (squid-reverse folder) the shared-memory section mount count is left at 3. This means that on nanobsd the CF card is left mounted read-write. This condition will persist until the next reboot, because there is nothing to decrement the count.
I have found 2 places here that do not match up conf_mount_rw and conf_mount_ro calls. There might be 1 more somewhere (or one of these routines is called twice during installation). I can check that when this change is committed and I can do another install from scratch.
-rw-r--r-- | config/squid-reverse/squid.inc | 3 |
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 */ |