From 2fd9b91fc1c811c1b23d9cbdbb9cb65d4971a399 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 6 Nov 2014 22:38:07 +0000 Subject: [PATCH] remove weavedns container on `weave reset` (and some cosmetics) Fixes #171 --- weave | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/weave b/weave index 402607ea..ecdb5af4 100755 --- a/weave +++ b/weave @@ -452,14 +452,16 @@ case "$COMMAND" in echo "Weave is not running." fi - docker rm -f $CONTAINER_NAME >/dev/null 2>&1 || true + docker rm -f $CONTAINER_NAME >/dev/null 2>&1 || true docker rm -f $DNS_CONTAINER_NAME >/dev/null 2>&1 || true check_command_and_run conntrack conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true ;; reset) [ $# -eq 0 ] || usage - docker kill $CONTAINER_NAME >/dev/null 2>&1 || true - docker rm -f $CONTAINER_NAME >/dev/null 2>&1 || true + docker kill $CONTAINER_NAME >/dev/null 2>&1 || true + docker kill $DNS_CONTAINER_NAME >/dev/null 2>&1 || true + docker rm -f $CONTAINER_NAME >/dev/null 2>&1 || true + docker rm -f $DNS_CONTAINER_NAME >/dev/null 2>&1 || true check_command_and_run conntrack 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