X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=lib%2Fifup;fp=lib%2Fifup;h=be231ceb5fe4ac7d778775b956506b4bd4b3a3ef;hb=0603354acf21cc77a19b97ae3218ae65cef3d138;hp=b8536af55959af9953e55f6662a8e0e9fff06881;hpb=04bf2001be9428d84c19aa5e988bd9e46ed797fa;p=rc-scripts.git

diff --git a/lib/ifup b/lib/ifup
index b8536af..be231ce 100755
--- a/lib/ifup
+++ b/lib/ifup
@@ -219,6 +219,19 @@ else
 	# IPv6 in use ?
 	if is_yes "$IPV6_NETWORKING" && [ -n "${IP6ADDR}" ]; then
 		ip addr add ${IP6ADDR} dev ${DEVICE} ${IP6ADDROPT}
+		timeout=0
+		while [ $timeout -le 20 ] && \
+		      if_state="`ip -o addr list dev ${DEVICE} to ${IP6ADDR}`" && \
+		      echo "$if_state" | grep -q tentative && \
+		      ! echo "$if_state" | grep -q dadfailed ; do
+			usleep 500000
+			timeout=$((timeout+1))
+		done
+		if ip -o addr list dev ${DEVICE} to ${IP6ADDR} | grep -q dadfailed ; then
+			ip addr del ${IP6ADDR} dev ${DEVICE}
+			nls '%s: Duplicated address detected: %s' "$DEVICE" "$IP6ADDR"
+			exit 1
+		fi
 		if [ -n "${IP6ADDRLABEL}" ]; then
 			ip addrlabel add prefix ${IP6ADDR} dev ${DEVICE} label ${IP6ADDRLABEL}
 		fi