From owner-freebsd-net@FreeBSD.ORG Mon Mar 8 02:26:45 2010 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C6CD1065670 for ; Mon, 8 Mar 2010 02:26:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id A9CFB8FC0A for ; Mon, 8 Mar 2010 02:26:44 +0000 (UTC) Received: (qmail 32409 invoked by uid 399); 8 Mar 2010 02:26:43 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 8 Mar 2010 02:26:43 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4B946062.6040305@FreeBSD.org> Date: Sun, 07 Mar 2010 18:26:42 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.7) Gecko/20100218 Thunderbird/3.0.1 MIME-Version: 1.0 To: freebsd-net@freebsd.org References: <4B945AA7.6070000@FreeBSD.org> In-Reply-To: <4B945AA7.6070000@FreeBSD.org> X-Enigmail-Version: 1.0.1 OpenPGP: id=D5B2F0FB Content-Type: multipart/mixed; boundary="------------040806040900080501090900" Subject: Re: Un-obsolete'ing ipv6_enable X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2010 02:26:45 -0000 This is a multi-part message in MIME format. --------------040806040900080501090900 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Oops, missed one. Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ --------------040806040900080501090900 Content-Type: text/plain; name="v6-prefer-diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="v6-prefer-diff" Index: network.subr =================================================================== --- network.subr (revision 204851) +++ network.subr (working copy) @@ -100,18 +100,12 @@ _ipv6_opts="-accept_rtadv" fi else - if checkyesno ipv6_prefer; then + if checkyesno ipv6_enable; then _ipv6_opts="-ifdisabled" + _ipv6_opts="${_ipv6_opts} accept_rtadv" else _ipv6_opts="ifdisabled" fi - - # backward compatibility: $ipv6_enable - case $ipv6_enable in - [Yy][Ee][Ss]) - _ipv6_opts="${_ipv6_opts} accept_rtadv" - ;; - esac fi if [ -n "${_ipv6_opts}" ]; then @@ -481,13 +475,6 @@ ;; esac - # backward compatibility: $ipv6_enable - case $ipv6_enable in - [Yy][Ee][Ss]) - return 0 - ;; - esac - _tmpargs=`_ifconfig_getargs $_if ipv6` for _arg in $_tmpargs; do case $_arg in Index: rc.d/netif =================================================================== --- rc.d/netif (revision 204851) +++ rc.d/netif (working copy) @@ -41,8 +41,6 @@ extra_commands="cloneup clonedown" cmdifn= -set_rcvar_obsolete ipv6_enable ipv6_prefer - network_start() { # Set the list of interfaces to work on. Index: rc.d/ip6addrctl =================================================================== --- rc.d/ip6addrctl (revision 204851) +++ rc.d/ip6addrctl (working copy) @@ -20,8 +20,6 @@ prefer_ipv6_cmd="ip6addrctl_prefer_ipv6" prefer_ipv4_cmd="ip6addrctl_prefer_ipv4" -set_rcvar_obsolete ipv6_enable ipv6_prefer - ip6addrctl_prefer_ipv6() { afexists inet6 || return 0 Index: defaults/rc.conf =================================================================== --- defaults/rc.conf (revision 204851) +++ defaults/rc.conf (working copy) @@ -439,6 +439,7 @@ icmp_bmcastecho="NO" # respond to broadcast ping packets ### IPv6 options: ### +ipv6_enable="NO" # Set to YES to enable IPv6 configuration. ipv6_network_interfaces="none" # List of IPv6 network interfaces # (or "auto" or "none"). ipv6_defaultrouter="NO" # Set to IPv6 default gateway (or NO). --------------040806040900080501090900--