interfaces: move the dhcpdv6 start up once more

This commit is contained in:
Franco Fichtner 2018-08-06 07:13:58 +02:00
parent abf1e44d74
commit dcc4ec0a82
2 changed files with 12 additions and 12 deletions

View File

@ -3799,19 +3799,8 @@ function link_interface_to_track6($wanif, $update = false)
services_radvd_configure();
}
/* XXX Can you take me higher? To the place where IPv6 works. */
$manual_dhcpv6 = false;
foreach ($list as $lanif => $lancfg) {
interface_track6_configure($lanif, $lancfg);
if (isset($lancfg['dhcpd6track6allowoverride'])) {
$manual_dhcpv6 = true;
}
}
if ($manual_dhcpv6) {
services_dhcpd_configure('inet6');
}
}

View File

@ -113,7 +113,18 @@ if (!empty($grouptmp)) {
array_walk($grouptmp, 'interface_group_add_member');
}
link_interface_to_track6($interface, true);
$manual_dhcpv6 = false;
foreach (link_interface_to_track6($interface, true) as $lanif => $lancfg) {
if (isset($lancfg['dhcpd6track6allowoverride'])) {
$manual_dhcpv6 = true;
}
}
if ($manual_dhcpv6) {
services_dhcpd_configure('inet6');
}
system_resolvconf_generate();
system_hosts_generate();