svn commit: r252360 - head/etc

[Xin LI]

Author: delphij
Date: Fri Jun 28 22:25:37 2013
New Revision: 252360
URL: http://svnweb.freebsd.org/changeset/base/252360

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

Modified:
  head/etc/network.subr

Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr	Fri Jun 28 21:47:08 2013	(r252359)
+++ head/etc/network.subr	Fri Jun 28 22:25:37 2013	(r252360)
@@ -318,6 +318,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
@@ -509,7 +518,7 @@ ipv6_autoconfif()
 	_if=$1
 
 	case $_if in
-	lo0|\
+	lo[0-9]*|\
 	stf[0-9]*|\
 	faith[0-9]*|\
 	lp[0-9]*|\