From bab606ee0bb8655cb5099e12f139e9cc15d78da2 Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Wed, 10 Jun 2015 20:14:12 -0400 Subject: [PATCH] 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 ec9eb7891780e5f142838c03203ad8ce267ed89e. --- etc/inc/util.inc | 3 --- etc/rc.bootup | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/etc/inc/util.inc b/etc/inc/util.inc index f98dbf2155..4ac5a6cb68 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -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)) { diff --git a/etc/rc.bootup b/etc/rc.bootup index b9208bba88..9e2729d2e1 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -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();