aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-09-11 08:38:52 +0200
committerdoktornotor <notordoktor@gmail.com>2015-09-11 08:38:52 +0200
commit46ddb5b2270dd1aaa2e56a76ebb363fe3de6b47c (patch)
tree916a942ec1a0bef8bfb7b007840b25add36fde64 /config/squid
parent8db0d25c53d4d49e6740eed2d7bb24ddecc48849 (diff)
downloadpfsense-packages-46ddb5b2270dd1aaa2e56a76ebb363fe3de6b47c.tar.gz
pfsense-packages-46ddb5b2270dd1aaa2e56a76ebb363fe3de6b47c.tar.bz2
pfsense-packages-46ddb5b2270dd1aaa2e56a76ebb363fe3de6b47c.zip
squid - 2.1.x compatible boot check
Diffstat (limited to 'config/squid')
-rw-r--r--config/squid/squid.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 27bff27b..5a0946bb 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -543,10 +543,15 @@ function squid_validate_auth($post, &$input_errors) {
}
function squid_install_cron($should_install) {
- global $config;
- if (platform_booting()) {
+ global $g, $config;
+ if (function_exists("platform_booting")) {
+ if (platform_booting()) {
+ return;
+ }
+ } elseif ($g['booting']) {
return;
}
+
parse_config(true);
if (is_array($config['installedpackages']['squidcache'])) {