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:34:59 +0200
commitec9eb7891780e5f142838c03203ad8ce267ed89e (patch)
tree7b206554bdc76465e2b1f0f58ad8b196d7b93149
parentcba32cb1d87b813792a0f8caaf68a22f66af76e3 (diff)
downloadpfsense-ec9eb7891780e5f142838c03203ad8ce267ed89e.zip
pfsense-ec9eb7891780e5f142838c03203ad8ce267ed89e.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 c4717b3..b546154 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -1551,6 +1551,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 7eca7f6..3cec5e2 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -459,9 +459,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