d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix $ipv6_network_interfaces and set it as AUTO by default.

Browse Source 
Based on:	changes in r206408 by dougb
This commit is contained in:
Hiroki Sato 2010-09-13 19:52:04 +00:00
parent c5ad71aff5
commit e5481092bb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=212575
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/defaults/rc.conf
View File

@ -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)

35
etc/network.subr
View File

@ -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
for i in ${ipv6_network_interfaces}; do
if [ "$i" = "$_if" ]; then
$_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
done
# backward compatibility: True if $ipv6_ifconfig_IF is defined.
_tmpargs=`get_if_var $_if ipv6_ifconfig_IF`
if [ -n "${_tmpargs}" ]; then
return 0
fi
;;
esac
return 1
}