summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-06-07 23:34:59 +0200
committerErmal LUÇI <eri@pfsense.org>2015-06-07 23:35:20 +0200
commit0d44aca64623da5a3eeef0619704a10b3cfda7a5 (patch)
tree59d47f86e43a28b65517226c94b2560615ed93a3
parent8c9216d5f2be3dda86032b24b187aba3328db0a8 (diff)
downloadpfsense-0d44aca64623da5a3eeef0619704a10b3cfda7a5.zip
pfsense-0d44aca64623da5a3eeef0619704a10b3cfda7a5.tar.gz
Ticket #4442 Do not process URL aliases during bootup but trigger it just after finished booting. This completely solves the bootup delays without lowering the timeout as before. Probably need to increase a bit the timeouts now to be friendly to other connections
-rw-r--r--etc/inc/util.inc3
-rwxr-xr-xetc/rc.bootup4
2 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index fad6321..28d7f5c 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -1447,6 +1447,9 @@ function alias_expand_urltable($name) {
$urltable_prefix = "/var/db/aliastables/";
$urltable_filename = $urltable_prefix . $name . ".txt";
+ if (platform_booting())
+ return;
+
if (is_array($config['aliases']['alias'])) {
foreach ($config['aliases']['alias'] as $alias) {
if (preg_match("/urltable/i", $alias['type']) && ($alias['name'] == $name)) {
diff --git a/etc/rc.bootup b/etc/rc.bootup
index ae1f8f6..171f4b3 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -448,9 +448,7 @@ unset($g['booting']);
if ($ipsec_dynamic_hosts) {
vpn_ipsec_configure();
}
-if ($ipsec_dynamic_hosts || !empty($filterdns)) {
- filter_configure();
-}
+filter_configure();
led_normalize();
OpenPOWER on IntegriCloud