diff --git a/test/280_with_or_without_dns_test.sh b/test/280_with_or_without_dns_test.sh index 21051f08ab..b75f14cea2 100755 --- a/test/280_with_or_without_dns_test.sh +++ b/test/280_with_or_without_dns_test.sh @@ -27,6 +27,5 @@ start_container $HOST1 $TARGET_IP/24 --name c2 -h $TARGET check_dns assert_no_dns_record --without-dns check_dns assert_dns_record -check_dns assert_dns_record --with-dns end_suite diff --git a/test/config.sh b/test/config.sh index f50e03b556..1b81143da6 100644 --- a/test/config.sh +++ b/test/config.sh @@ -151,7 +151,7 @@ start_container() { start_container_with_dns() { host=$1 shift 1 - weave_on $host run --with-dns "$@" -t $DNS_IMAGE /bin/sh + weave_on $host run "$@" -t $DNS_IMAGE /bin/sh } proxy_start_container() { diff --git a/weave b/weave index bd3c49dc77..023f825ac8 100755 --- a/weave +++ b/weave @@ -59,7 +59,7 @@ weave connect [--replace] [ ...] weave forget ... weave status [targets | connections | peers | dns] weave report [-f ] -weave run [--with-dns | --without-dns] [--no-rewrite-hosts] +weave run [--without-dns] [--no-rewrite-hosts] [ ...] ... weave start [ ...] weave attach [ ...] @@ -1054,12 +1054,11 @@ dns_args() { NAME_ARG="" HOSTNAME_SPECIFIED= DNS_SEARCH_SPECIFIED= - WITH_DNS= WITHOUT_DNS= while [ $# -gt 0 ] ; do case "$1" in --with-dns) - WITH_DNS=1 + echo "Warning: $1 is deprecated; it is on by default" >&2 ;; --without-dns) WITHOUT_DNS=1