Mercurial > hg > dhcpcd
changeset 2529:eddad85c5804 draft
Default to private stable addresses via dhcpcd.conf instead of the binary
so that upgraders aren't adversely affected.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Thu, 05 Jun 2014 20:23:19 +0000 |
| parents | 903fa08b254c |
| children | 959391cdb761 |
| files | dhcpcd.8.in dhcpcd.conf dhcpcd.conf.5.in if-options.c |
| diffstat | 4 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/dhcpcd.8.in Thu Jun 05 17:42:21 2014 +0000 +++ b/dhcpcd.8.in Thu Jun 05 20:23:19 2014 +0000 @@ -109,10 +109,7 @@ is also an implementation of the IPv6 Router Solicitor as specified in .%R RFC 4861 and -.%R RFC 6106 -and will generate stable private Interface Identifiers for SLAAC -as specified in -.%R RFC 7212 . +.%R RFC 6106 . .Pp .Nm is also an implemenation of the DHCPv6 client as specified in
--- a/dhcpcd.conf Thu Jun 05 17:42:21 2014 +0000 +++ b/dhcpcd.conf Thu Jun 05 20:23:19 2014 +0000 @@ -30,6 +30,9 @@ # A ServerID is required by RFC2131. require dhcp_server_identifier +# Generate Stable Private IPv6 Addresses instead of hardware based ones +slaac private + # A hook script is provided to lookup the hostname if not set by the DHCP # server, but it should not be run by default. nohook lookup-hostname
--- a/dhcpcd.conf.5.in Thu Jun 05 17:42:21 2014 +0000 +++ b/dhcpcd.conf.5.in Thu Jun 05 20:23:19 2014 +0000 @@ -455,9 +455,6 @@ .Ar ssid . .It Ic slaac Op Ar hwaddr | Ar private Selects the interface identifier used for SLAAC generated IPv6 addresses. -.Ar private -is the default and complies with -.%R RFC 7217. .It Ic static Ar value Configures a static .Ar value .
--- a/if-options.c Thu Jun 05 17:42:21 2014 +0000 +++ b/if-options.c Thu Jun 05 20:23:19 2014 +0000 @@ -1952,7 +1952,6 @@ #endif #ifdef INET6 ifo->options |= DHCPCD_IPV6 | DHCPCD_IPV6RS | DHCPCD_IPV6RA_REQRDNSS; - ifo->options |= DHCPCD_SLAACPRIVATE; ifo->options |= DHCPCD_DHCP6; #endif ifo->timeout = DEFAULT_TIMEOUT;