mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "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"

Browse Source 
This reverts commit ec9eb78917.
This commit is contained in:
Chris Buechler 2015-06-10 20:14:12 -04:00
parent 3474e2998f
commit bab606ee0b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/inc/util.inc
View File

@ -1551,9 +1551,6 @@ 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)) {

4
etc/rc.bootup
View File

@ -456,7 +456,9 @@ unset($g['booting']);
if ($ipsec_dynamic_hosts) {
vpn_ipsec_configure();
}
filter_configure();
if ($ipsec_dynamic_hosts || !empty($filterdns)) {
filter_configure();
}
led_normalize();