Move the wait for a default route to rc.d/routing. Once we test for

non-dhcp interfaces to negotiate/associate this will make more sense.

This also correctly gets run after both devd and netif are run so it has
a chance of working.

1 files changed, 27 insertions, 1 deletions

diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 874eda5..33424fd 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -6,10 +6,11 @@
 #
 
 # PROVIDE: routing
-# REQUIRE: netif ppp
+# REQUIRE: devd netif ppp
 # KEYWORD: nojail
 
 . /etc/rc.subr
+. /etc/network.subr
 
 name="routing"
 start_cmd="routing_start"
@@ -22,6 +23,31 @@ 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()