svn commit: r272864 - stable/10/etc/rc.d

[Hiroki Sato]

Author: hrs
Date: Thu Oct  9 23:40:08 2014
New Revision: 272864
URL: https://svnweb.freebsd.org/changeset/base/272864

Log:
  MFC r270836:
  
    Use ipv6_prefer when at least one ifconfig_IF_ipv6 is configured.

Modified:
  stable/10/etc/rc.d/ip6addrctl
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/ip6addrctl
==============================================================================
--- stable/10/etc/rc.d/ip6addrctl	Thu Oct  9 23:39:17 2014	(r272863)
+++ stable/10/etc/rc.d/ip6addrctl	Thu Oct  9 23:40:08 2014	(r272864)
@@ -75,6 +75,8 @@ ip6addrctl_start()
 		else
 			if checkyesno ipv6_activate_all_interfaces; then
 				ip6addrctl_prefer_ipv6
+			elif [ -n "$(list_vars ifconfig_\*_ipv6)" ]; then
+				ip6addrctl_prefer_ipv6
 			else
 				ip6addrctl_prefer_ipv4
 			fi