From 0d44aca64623da5a3eeef0619704a10b3cfda7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20LU=C3=87I?= Date: Sun, 7 Jun 2015 23:34:59 +0200 Subject: [PATCH] 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 --- etc/inc/util.inc | 3 +++ etc/rc.bootup | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/inc/util.inc b/etc/inc/util.inc index fad6321e06..28d7f5ccc6 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 ae1f8f6d28..171f4b3f3b 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();