From 317c6ba04c5b7188febd9bb7ed9f1f9f0c4fdd5b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 14 Nov 2016 16:11:42 +0000 Subject: [PATCH] Better value for --ipalloc-range in attach-router The previous regex matched a blank --ipalloc-range and the following parameter, which defeated the whole point of the check. --- weave | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weave b/weave index dadd9b02..511cc383 100755 --- a/weave +++ b/weave @@ -1704,7 +1704,7 @@ setup_awsvpc() { # Recreate the parameter values that are set when the router is first launched fetch_router_args() { CONTAINER_ARGS=$(docker inspect -f '{{.Args}}' $CONTAINER_NAME) || return 1 - IPRANGE=$(echo $CONTAINER_ARGS | grep -o -e '-ipalloc-range [^ ]*') || true + IPRANGE=$(echo $CONTAINER_ARGS | grep -o -E -e '-ipalloc-range [0-9/.]+') || true NO_DNS_OPT=$(echo $CONTAINER_ARGS | grep -o -e '--no-dns') || true }