From c223ff1c7d34b8ad707633658eb861cbbc9852d4 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 6 Apr 2017 14:32:49 +0000
Subject: [PATCH] Support --without-dns in 'weave attach'

---
 weave | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/weave b/weave
index 8960ce1d..a1fd8abc 100755
--- a/weave
+++ b/weave
@@ -2009,8 +2009,12 @@ EOF
         NO_MULTICAST_ROUTE=
         collect_cidr_args "$@"
         shift $CIDR_ARG_COUNT
+        WITHOUT_DNS=
         while [ $# -gt 0 ]; do
             case "$1" in
+                --without-dns)
+                    WITHOUT_DNS=1
+                    ;;
                 --rewrite-hosts)
                     REWRITE_HOSTS=1
                     ;;
@@ -2036,7 +2040,7 @@ EOF
         ipam_cidrs allocate $CONTAINER $CIDR_ARGS
         [ -n "$REWRITE_HOSTS" ] && rewrite_etc_hosts $DNS_EXTRA_HOSTS
         attach $ALL_CIDRS >/dev/null
-        when_weave_running with_container_fqdn $CONTAINER put_dns_fqdn $ALL_CIDRS
+        [ -n "$WITHOUT_DNS" ] || when_weave_running with_container_fqdn $CONTAINER put_dns_fqdn $ALL_CIDRS
         show_addrs $ALL_CIDRS
         ;;
     detach)