X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=lib%2Fifup;h=b8536af55959af9953e55f6662a8e0e9fff06881;hb=refs%2Fheads%2Fmaster;hp=5d6fc21ed944b02ddf6ead4236f70edb79252527;hpb=49ade4f4b5b1978db4561d62063008a339a1526f;p=rc-scripts.git

diff --git a/lib/ifup b/lib/ifup
index 5d6fc21..be231ce 100755
--- a/lib/ifup
+++ b/lib/ifup
@@ -125,11 +125,13 @@ if [ -n "$ETHTOOL_OPTS" ] ; then
 fi
 
 if is_yes "$SLAVE" && [ -n "$MASTER" ] ; then
-	if ! grep -wq "${DEVICE}" /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null; then
-		nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
-		ip link set dev ${DEVICE} down
-		echo "+${DEVICE}" > /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null
-	fi
+	# create master if it doesn't exist yet
+	[ ! -d "/sys/class/net/${MASTER}" ] && ip link add "${MASTER}" type bond
+
+	nls "Enslaving %s to %s" "${DEVICE}" "${MASTER}"
+	ip link set "${DEVICE}" master "${MASTER}"
+	ip link set "${DEVICE}" up
+
 	exit 0
 fi
 
@@ -217,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