Fix the wait for default route change I made a few weeks ago by creating

a new defaultroute script that just does the wait.  The previous attempt
created a circular dependency through network_ipv6.

Pointy hat to:	brooks

1 files changed, 1 insertions, 26 deletions

diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 33424fd..818df92 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -6,7 +6,7 @@
 #
 
 # PROVIDE: routing
-# REQUIRE: devd netif ppp
+# REQUIRE: netif ppp
 # KEYWORD: nojail
 
 . /etc/rc.subr
@@ -23,31 +23,6 @@ routing_start()
 {
 	static_start
 	options_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.
-	dhcp_interfaces=`list_net_interfaces dhcp`
-	[ -z "`list_net_interfaces dhcp`" ] && return
-
-	# Wait for a default route
-	delay=${if_up_delay}
-	while [ ${delay} -gt 0 ]; do
-		defif=`get_default_if -inet`
-		if [ -n "${defif}" ]; then
-			if [ ${delay} -ne ${if_up_delay} ]; then
-				echo "($defif)"
-			fi
-			break
-		fi
-		if [ ${delay} -eq ${if_up_delay} ]; then
-			echo -n "Waiting ${delay}s for an interface to come up: "
-		else
-			echo -n .
-		fi
-		sleep 1
-		delay=`expr $delay - 1`
-	done
 }
 
 routing_stop()