svn commit: r252768 - stable/9/etc

[Xin LI]

Author: delphij
Date: Fri Jul  5 04:22:40 2013
New Revision: 252768
URL: http://svnweb.freebsd.org/changeset/base/252768

Log:
  MFC r252360:
  
  Don't attempt to do DHCP on certain interfaces, similar to what's done for
  ipv6_autoconfif() in r212577.

Modified:
  stable/9/etc/network.subr
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/network.subr
==============================================================================
--- stable/9/etc/network.subr	Fri Jul  5 04:16:52 2013	(r252767)
+++ stable/9/etc/network.subr	Fri Jul  5 04:22:40 2013	(r252768)
@@ -306,6 +306,15 @@ dhcpif()
 	local _tmpargs _arg
 	_tmpargs=`_ifconfig_getargs $1`
 
+	case $1 in
+	lo[0-9]*|\
+	stf[0-9]*|\
+	faith[0-9]*|\
+	lp[0-9]*|\
+	sl[0-9]*)
+		return 1
+		;;
+	esac
 	if noafif $1; then
 		return 1
 	fi
@@ -491,7 +500,7 @@ ipv6_autoconfif()
 	_if=$1
 
 	case $_if in
-	lo0|\
+	lo[0-9]*|\
 	stf[0-9]*|\
 	faith[0-9]*|\
 	lp[0-9]*|\