X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=functions;h=8f39d4014e9213a56c63f4dc03b228f94e73c5ce;hb=HEAD;hp=8d2d5f3661a786943df9d1f20ed028ac6984690c;hpb=7bf7a4a1f847eed595b09c7e17743b93cec26f36;p=rrq%2Foverlay-boot.git

diff --git a/functions b/functions
index 8d2d5f3..8f39d40 100644
--- a/functions
+++ b/functions
@@ -103,6 +103,12 @@ setup_veth_cables() {
     for C in "$@" ; do
 	IF=$NETNS$i
 	MAC="${C#*=}"
+        if ip link show $IF > /dev/null 2>&1 ; then
+           : # The interface exists already (bad badness); let things fail
+        elif ifquery --state $IF >/dev/null 2>&1 ; then
+            # doesn't exist but has residue state; quiet cleanup
+            ifdown -f $IF > /dev/null 2>&1
+        fi
 	if [ -z "$MAC" ] ; then
 	    # set up veth with "random" mac address
 	    ip link add $IF type veth peer name eth$i netns $NETNS
@@ -115,11 +121,11 @@ setup_veth_cables() {
 	    # set up veth with specified mac address
 	    ip link add $IF type veth peer name eth$i address $MAC netns $NETNS
 	fi
-	ip link set $IF up
 	BR="${C%=*}"
 	if [ -z "$BR" ] ; then
-	    ifup $IF
+	    ifup $IF || ip link set $IF up
 	else
+	    ip link set $IF up
 	    brctl addif $BR $IF
 	fi
 	i=$((i+1))
@@ -163,7 +169,7 @@ setup_overlay() {
     elif [ "$LIVE" != "$UPPER" ] ; then
 	# With UPPER = LOWER we rather make a bind mount to LIVE
 	env CONFIG="$CONFIG" $PREMOUNT "$UPPER"
-	mount --bind $UPPER $LOWER
+	mount --bind $UPPER $LIVE
     fi
 
     grep ^SHARE= "$CONFIG" | while read A ; do