summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-05-12 22:39:52 -0500
committerChris Buechler <cmb@pfsense.org>2016-05-12 22:39:52 -0500
commit6d4fd80b3d3a4ce887cc6da7f38e3877cbd56793 (patch)
tree782e533ae7b91daa3d6f3115921fc2f2b49672c3
parent34d58bad91db148990c071e333375756392d396f (diff)
downloadpfsense-6d4fd80b3d3a4ce887cc6da7f38e3877cbd56793.zip
pfsense-6d4fd80b3d3a4ce887cc6da7f38e3877cbd56793.tar.gz
Don't start unbound in track6 config if system is booting. Add dnsmasq here as well. Based on PR 2943. Ticket #6186
-rw-r--r--src/etc/inc/interfaces.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index cefa7ab..36cb8d6 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -3553,7 +3553,7 @@ function interface_track6_configure($interface = "lan", $wancfg, $linkupevent =
break;
}
- if ($linkupevent == false) {
+ if ($linkupevent == false && !platform_booting()) {
if (!function_exists('services_dhcpd_configure')) {
require_once("services.inc");
}
@@ -3562,6 +3562,10 @@ function interface_track6_configure($interface = "lan", $wancfg, $linkupevent =
services_unbound_configure();
}
+ if (isset($config['dnsmasq']['enable'])) {
+ services_dnsmasq_configure();
+ }
+
services_dhcpd_configure("inet6");
}
OpenPOWER on IntegriCloud