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

diff --git a/functions b/functions
index fa1d527..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