From 5dd8584fb691bc673a76c35c3960d5f057950ca5 Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Thu, 18 Feb 2016 12:11:48 +0000
Subject: [PATCH] Fix veth cleanup on Ubuntu 15.10

Cope with the @ characters that have started appearing in veth names as
of Ubuntu 15.10.
---
 weave | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weave b/weave
index 1460c735..333ab905 100755
--- a/weave
+++ b/weave
@@ -694,7 +694,7 @@ destroy_bridge() {
     done
 
     # Remove any lingering bridged fastdp, pcap and attach-bridge veths
-    for VETH in $(ip -o link show | grep -o v${CONTAINER_IFNAME}[^:]*) ; do
+    for VETH in $(ip -o link show | grep -o v${CONTAINER_IFNAME}[^:@]*) ; do
         ip link del $VETH >/dev/null 2>&1 || true
     done