From 64c4d3875d610191658fb05d9317086fdb72257c Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Wed, 11 Apr 2007 10:40:53 +0000
Subject: Move carrier detection back into net.sh. Reserve a new hook numbers

---
 net/dhclient.sh | 2 --
 net/dhcpcd.sh   | 2 --
 2 files changed, 4 deletions(-)

(limited to 'net')

diff --git a/net/dhclient.sh b/net/dhclient.sh
index 14838d00..dc013379 100644
--- a/net/dhclient.sh
+++ b/net/dhclient.sh
@@ -13,8 +13,6 @@ dhclient_start() {
 	local args= opt= opts= pidfile="/var/run/dhclient-${IFACE}.pid"
 	local sendhost=true dconf=
 
-	_wait_for_carrier || return 1
-
 	# Get our options
 	eval opts=\$dhcp_${IFVAR}
 	[ -z "${opts}" ] && opts=${dhcp}
diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh
index f90f3336..f8e81f98 100644
--- a/net/dhcpcd.sh
+++ b/net/dhcpcd.sh
@@ -15,8 +15,6 @@ _config_vars="$_config_vars dhcp dhcpcd"
 dhcpcd_start() {
 	local args= opt= opts= pidfile="/var/run/dhcpcd-${IFACE}.pid"
 
-	_wait_for_carrier || return 1
-
 	eval args=\$dhcpcd_${IFVAR}
 
 	# Get our options
-- 
cgit v1.2.3