From 807e5d725086832b899ba03a2203824ecf296d8b Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 4 Sep 2009 13:23:35 +0100
Subject: Timeout for ipv6 addresses being tentative.

---
 net/iproute2.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index b1fe8619..d983c9bd 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -225,6 +225,8 @@ _iproute2_ipv6_tentative()
 
 iproute2_post_start()
 {
+	local n=5
+
 	# Kernel may not have IP built in
 	if [ -e /proc/net/route ]; then
 		ip route flush table cache dev "${IFACE}"
@@ -232,11 +234,16 @@ iproute2_post_start()
 
 	if _iproute2_ipv6_tentative; then
 		ebegin "Waiting for IPv6 addresses"
-		while true; do
+		while [ $n -ge 0 ]; do
 			_iproute2_ipv6_tentative || break
+			sleep 1
+			n=$(($n - 1))
 		done
-		eend 0
+		[ $n -ge 0 ]
+		eend $?
 	fi
+
+	return 0
 }
 
 iproute2_post_stop()
-- 
cgit v1.2.3