diff options
| author | hrs <hrs@FreeBSD.org> | 2010-09-13 19:51:15 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2010-09-13 19:51:15 +0000 |
| commit | 3319d93aea4340bab959aaa636738910a48960da (patch) | |
| tree | dcff0aae5c63fdf041424dbf02aaddadf00353be /etc/defaults/rc.conf | |
| parent | 7766ec39d496d5f467624ce957fb8cbc33958626 (diff) | |
| download | FreeBSD-src-3319d93aea4340bab959aaa636738910a48960da.zip FreeBSD-src-3319d93aea4340bab959aaa636738910a48960da.tar.gz | |
Revert changes in r206408.
Discussed with: dougb, core.5, and core.6
Diffstat (limited to 'etc/defaults/rc.conf')
| -rw-r--r-- | etc/defaults/rc.conf | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 427fe2d..c875b28 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -210,8 +210,6 @@ cloned_interfaces="" # List of cloned network interfaces to create. ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. #ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry. -#ifconfig_ed0_ipv6="RTADV" # Sample IPv6 entry for RA/rtsol(8) -#ifconfig_ed0_ipv6="inet6 auto_linklocal" # To configure only link-local #ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry #ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias #ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0. @@ -446,9 +444,8 @@ ubthidhci_enable="NO" # Switch an USB BT controller present on icmp_bmcastecho="NO" # respond to broadcast ping packets ### IPv6 options: ### -ipv6_network_interfaces="AUTO" # List of IPv6 network interfaces -ipv6_prefer="YES" # Use IPv6 when both IPv4 and IPv6 can be used -ipv6_privacy="NO" # Use privacy addresses with RTADV (RFC 4193) +ipv6_network_interfaces="none" # 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) ipv6_static_routes="" # Set to static route list (or leave empty). @@ -507,6 +504,7 @@ ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter, # for examples ip6addrctl_enable="YES" # Set to YES to enable default address selection ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages +ipv6_prefer="NO" # Use IPv6 when both IPv4 and IPv6 can be used ############################################################## ### System console options ################################# |
