Un-obsolete'ing ipv6_enable

[Doug Barton]

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/

-------------- next part --------------
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).