diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-01-28 17:57:37 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-01-28 17:57:37 -0600 |
| commit | 0c9b98c0731f6486ee0734f58a099cd6023077d8 (patch) | |
| tree | 6fd4604c75225acb232649e2e630fd86eb3f2d84 /src/etc/rc.newwanip | |
| parent | 7d8552fc50e0ea445fd59067f67b95557003f687 (diff) | |
| download | pfsense-0c9b98c0731f6486ee0734f58a099cd6023077d8.zip pfsense-0c9b98c0731f6486ee0734f58a099cd6023077d8.tar.gz | |
Import David W's patch fixing issues with dhcp6c being launched multiple times in some circumstances. Ticket #5621
Diffstat (limited to 'src/etc/rc.newwanip')
| -rwxr-xr-x | src/etc/rc.newwanip | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index bfbe78b..880e64a 100755 --- a/src/etc/rc.newwanip +++ b/src/etc/rc.newwanip @@ -176,7 +176,9 @@ switch ($config['interfaces'][$interface]['ipaddrv6']) { interface_6rd_configure($interface, $config['interfaces'][$interface]); break; case "dhcp6": - if (isset($config['interfaces'][$interface]['dhcp6usev4iface'])) { + // N.B. PPP connections using PPP as the IPv6 parent interface are excluded because the ppp-ipv6 script calls + // interface_dhcpv6_configure() for these connections after IPv6CP is up + if (isset($config['interfaces'][$interface]['dhcp6usev4iface']) && !interface_isppp_type($interface)) { interface_dhcpv6_configure($interface, $config['interfaces'][$interface]); } break; |
