From ea3456756d67db5a84618ec00f36d24df4dd5692 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 28 Mar 2016 14:04:07 +0100
Subject: [PATCH] make `weave dns-args` and `weave run` work with --no-dns

...rather than exploding

i.e. the former returns nothing and the latter leaves naming related
container settings untouched, just like happens in the proxy and
plugin.

Fixes #2099.
---
 weave | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index 36502741..e1a352dc 100755
--- a/weave
+++ b/weave
@@ -1092,6 +1092,7 @@ peer_args() {
 # Memoized function to query the weaveDNS server for our dns domain.
 dns_domain() {
     DNS_DOMAIN=${DNS_DOMAIN:-$(call_weave GET /domain 2>/dev/null || true)}
+    [ "$DNS_DOMAIN" = "404 page not found" ] && return 1
     DNS_DOMAIN=${DNS_DOMAIN:-weave.local.}
     echo $DNS_DOMAIN
 }
@@ -1127,9 +1128,9 @@ dns_args() {
         shift
     done
     [ -n "$WITHOUT_DNS" ] && return 0
+    DOMAIN=$(dns_domain) || return 0
     DNS_ARGS="--dns $DOCKER_BRIDGE_IP"
     if [ -n "$NAME_ARG" -a -z "$HOSTNAME_SPECIFIED" ] ; then
-        DOMAIN=$(dns_domain)
         HOSTNAME="$NAME_ARG.${DOMAIN%.}"
         if [ ${#HOSTNAME} -gt 64 ] ; then
             echo "Container name too long to be used as hostname" >&2
@@ -1140,7 +1141,7 @@ dns_args() {
     fi
     if [ -z "$DNS_SEARCH_SPECIFIED" ] ; then
       if [ -z "$HOSTNAME_SPECIFIED" ] ; then
-        DNS_ARGS="$DNS_ARGS --dns-search=$(dns_domain)"
+        DNS_ARGS="$DNS_ARGS --dns-search=$DOMAIN"
       else
         DNS_ARGS="$DNS_ARGS --dns-search=."
       fi