Revert "Always send a -HUP to dhcp6c in interfaces_track6_configure for DHCP6 WAN types. Doing so isn't any more disruptive than what it's already doing, and that ensures track6 interfaces don't lose their IPv6 IPs. Ticket #5945"

This reverts commit 471b81f8f7.
This commit is contained in:
Chris Buechler 2016-03-03 13:03:45 -06:00
parent ffb8625fb3
commit 12d7d9e71e

View File

@ -3529,10 +3529,18 @@ function interface_track6_configure($interface = "lan", $wancfg, $linkupevent =
interface_track6_6rd_configure($interface, $wancfg);
break;
case "dhcp6":
$parentrealif = get_real_interface($wancfg['track6-interface']);
$pidv6 = find_dhcp6c_process($parentrealif);
if ($pidv6) {
posix_kill($pidv6, SIGHUP);
if ($linkupevent == true) {
/*
* NOTE: Usually come here from rc.linkup calling so just call directly instead of generating event
* Instead of disrupting all other v4 configuration just restart DHCPv6 client for now
*
* XXX: Probably DHCPv6 client should handle this automagically itself?
*/
$parentrealif = get_real_interface($wancfg['track6-interface']);
$pidv6 = find_dhcp6c_process($parentrealif);
if ($pidv6) {
posix_kill($pidv6, SIGHUP);
}
}
break;
}