Merge pull request #1365 from weaveworks/1356_ignore_interface_deletion_errors_in_weave_reset

ignore interface deletion errors during `weave reset`
This commit is contained in:
Michael Bridgen committed 2015-08-27 15:38:16 +01:00
commit bca31c7335
1 file changed
+1 -1
+1 -1
View File
@@ -1300,7 +1300,7 @@ case "$COMMAND" in
conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true
destroy_bridge
for LOCAL_IFNAME in $(ip link show | grep v${CONTAINER_IFNAME}pl | cut -d ' ' -f 2 | tr -d ':') ; do
ip link del $LOCAL_IFNAME
ip link del $LOCAL_IFNAME >/dev/null 2>&1 || true
done
;;
rmpeer)