From owner-svn-src-all@FreeBSD.ORG  Mon Feb  2 15:33:22 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63277106564A;
	Mon,  2 Feb 2009 15:33:22 +0000 (UTC) (envelope-from mtm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F7868FC17;
	Mon,  2 Feb 2009 15:33:22 +0000 (UTC) (envelope-from mtm@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n12FXMbF000482;
	Mon, 2 Feb 2009 15:33:22 GMT (envelope-from mtm@svn.freebsd.org)
Received: (from mtm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n12FXMHC000481;
	Mon, 2 Feb 2009 15:33:22 GMT (envelope-from mtm@svn.freebsd.org)
Message-Id: <200902021533.n12FXMHC000481@svn.freebsd.org>
From: Mike Makonnen <mtm@FreeBSD.org>
Date: Mon, 2 Feb 2009 15:33:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188009 - head/etc/rc.d
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2009 15:33:22 -0000

Author: mtm
Date: Mon Feb  2 15:33:22 2009
New Revision: 188009
URL: http://svn.freebsd.org/changeset/base/188009

Log:
  The 30 second wait for network interfaces to show up effectively makes the
  time to boot an unplugged system 30 sec. longer for no good reason. Therefore,
  add a check to make sure that any DHCP interfaces are plugged in before
  waiting.

Modified:
  head/etc/rc.d/defaultroute

Modified: head/etc/rc.d/defaultroute
==============================================================================
--- head/etc/rc.d/defaultroute	Mon Feb  2 14:30:07 2009	(r188008)
+++ head/etc/rc.d/defaultroute	Mon Feb  2 15:33:22 2009	(r188009)
@@ -18,10 +18,21 @@ stop_cmd=":"
 
 defaultroute_start()
 {
-	# Return without waiting if we don't have dhcp interfaces.
-	# Once we can test that the link is actually up, we should
-	# remove this test and always wait.
-	[ -z "`list_net_interfaces dhcp`" ] && return
+	local output carrier nocarrier
+
+	# Return without waiting if we don't have dhcp interfaces or
+	# if none of the dhcp interfaces is plugged in.
+	dhcp_interfaces=`list_net_interfaces dhcp`
+	[ -z "${dhcp_interfaces}" ] && return
+	carrier=false
+	for _if in ${dhcp_interfaces}; do
+		output=`/sbin/ifconfig ${_if}` 
+		nocarrier=`expr "${output}" : '.*[[:blank:]]status: \(no carrier\)'`
+		[ -z "${nocarrier}" ] && carrier=true
+	done
+	if ! ${carrier}; then
+		return
+	fi
 
 	# Wait for a default route
 	delay=${if_up_delay}