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"

This reverts commit 0d44aca64623da5a3eeef0619704a10b3cfda7a5.

2 files changed, 3 insertions, 4 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 28d7f5c..fad6321 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -1447,9 +1447,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)) {
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 1238b7a..d2f0b82 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -445,7 +445,9 @@ unset($g['booting']);
 if ($ipsec_dynamic_hosts) {
 	vpn_ipsec_configure();
 }
-filter_configure();
+if ($ipsec_dynamic_hosts || !empty($filterdns)) {
+	filter_configure();
+}
 
 led_normalize();