From 36ee8bacb09df55fe5496c023811b80c2e500c50 Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Tue, 9 Feb 2016 16:40:12 +0000
Subject: [PATCH] Remove all vethwe* interfaces in reset

---
 weave | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/weave b/weave
index 580c3493..ee8ec32c 100755
--- a/weave
+++ b/weave
@@ -677,10 +677,10 @@ destroy_bridge() {
         fi
     done
 
-    # Remove any lingering bridged fastdp and pcap veths
-    ip link del $DATAPATH_IFNAME >/dev/null 2>&1 || true
-    ip link del $BRIDGE_IFNAME >/dev/null 2>&1 || true
-    ip link del $PCAP_IFNAME >/dev/null 2>&1 || true
+    # Remove any lingering bridged fastdp, pcap and attach-bridge veths
+    for VETH in $(ip -o link show | grep -o v${CONTAINER_IFNAME}[^:]*) ; do
+        ip link del $VETH >/dev/null 2>&1 || true
+    done
 
     if [ "$DOCKER_BRIDGE" != "$BRIDGE" ] ; then
         run_iptables -t filter -D FORWARD -i $DOCKER_BRIDGE -o $BRIDGE -j DROP 2>/dev/null || true