diff options
| author | hrs <hrs@FreeBSD.org> | 2010-09-13 19:52:04 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2010-09-13 19:52:04 +0000 |
| commit | 03d1ec35f183185d4968942088a39d969eedfed0 (patch) | |
| tree | bdfe7247959caa94ee825cfc96001fb2075bccf4 /etc | |
| parent | 3319d93aea4340bab959aaa636738910a48960da (diff) | |
| download | FreeBSD-src-03d1ec35f183185d4968942088a39d969eedfed0.zip FreeBSD-src-03d1ec35f183185d4968942088a39d969eedfed0.tar.gz | |
Fix $ipv6_network_interfaces and set it as AUTO by default.
Based on: changes in r206408 by dougb
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 2 | ||||
| -rw-r--r-- | etc/network.subr | 33 |
2 files changed, 12 insertions, 23 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index c875b28..5ff00fc 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -444,7 +444,7 @@ ubthidhci_enable="NO" # Switch an USB BT controller present on icmp_bmcastecho="NO" # respond to broadcast ping packets ### IPv6 options: ### -ipv6_network_interfaces="none" # List of IPv6 network interfaces +ipv6_network_interfaces="auto" # List of IPv6 network interfaces # (or "auto" or "none"). ipv6_defaultrouter="NO" # Set to IPv6 default gateway (or NO). #ipv6_defaultrouter="2002:c058:6301::" # Use this for 6to4 (RFC 3068) diff --git a/etc/network.subr b/etc/network.subr index e7b5945..aba8e45 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -417,32 +417,21 @@ ipv6if() ;; esac - # True if $ifconfig_IF_ipv6 is defined. - _tmpargs=`_ifconfig_getargs $_if ipv6` - if [ -n "${_tmpargs}" ]; then - return 0 - fi - - # backward compatibility: True if $ipv6_ifconfig_IF is defined. - _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` - if [ -n "${_tmpargs}" ]; then - return 0 - fi - case "${ipv6_network_interfaces}" in - [Aa][Uu][Tt][Oo]) - return 0 - ;; - ''|[Nn][Oo][Nn][Ee]) - return 1 - ;; - esac + $_if|"$_if "*|*" $_if"|*" $_if "*|[Aa][Uu][Tt][Oo]) + # True if $ifconfig_IF_ipv6 is defined. + _tmpargs=`_ifconfig_getargs $_if ipv6` + if [ -n "${_tmpargs}" ]; then + return 0 + fi - for i in ${ipv6_network_interfaces}; do - if [ "$i" = "$_if" ]; then + # backward compatibility: True if $ipv6_ifconfig_IF is defined. + _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` + if [ -n "${_tmpargs}" ]; then return 0 fi - done + ;; + esac return 1 } |
