diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-05-12 22:39:52 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-05-12 22:40:39 -0500 |
| commit | b460c43b93155254068f7da343662c6abf728e08 (patch) | |
| tree | b2b8636db641e7b598c71bad108be00632f1aff2 /src | |
| parent | cd227001e5ccecaf0ba25dd5a1a8d68a703d8801 (diff) | |
| download | pfsense-b460c43b93155254068f7da343662c6abf728e08.zip pfsense-b460c43b93155254068f7da343662c6abf728e08.tar.gz | |
Don't start unbound in track6 config if system is booting. Add dnsmasq here as well. Based on PR 2943. Ticket #6186
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/interfaces.inc | 6 |
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"); } |
