From 3595c71d8b31049e7e8d08c511f8f6365be4eaf0 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 12 May 2017 13:24:39 +0000
Subject: [PATCH 1/3] No special parsing needed for DNS arguments

---
 weave | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/weave b/weave
index caa105c3..ab55ed91 100755
--- a/weave
+++ b/weave
@@ -1242,8 +1242,6 @@ launch() {
     IPRANGE_SPECIFIED=
 
     [ -n "$DOCKER_BRIDGE_IP" ] || DOCKER_BRIDGE_IP=$(util_op bridge-ip $DOCKER_BRIDGE)
-    DNS_ROUTER_OPTS="--dns-listen-address $DOCKER_BRIDGE_IP:53"
-    NO_DNS_OPT=
 
     while [ $# -gt 0 ] ; do
         case "$1" in
@@ -1275,10 +1273,6 @@ launch() {
                 IPRANGE="${1#*=}"
                 IPRANGE_SPECIFIED=1
                 ;;
-            --no-dns)
-                DNS_ROUTER_OPTS=
-                NO_DNS_OPT="--no-dns"
-                ;;
             --no-restart)
                 RESTART_POLICY=
                 ;;
@@ -1374,7 +1368,7 @@ launch() {
         $(router_bridge_opts) \
         --ipalloc-range "$IPRANGE" \
         --dns-effective-listen-address $DOCKER_BRIDGE_IP \
-        $DNS_ROUTER_OPTS $NO_DNS_OPT \
+        --dns-listen-address $DOCKER_BRIDGE_IP:53 \
         $PLUGIN_ARGS \
         --http-addr $HTTP_ADDR \
         --status-addr $STATUS_ADDR \

From 9f40d913c9fac6fac4e00fe0e6b3c62fe1735be6 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 12 May 2017 13:24:59 +0000
Subject: [PATCH 2/3] No special parsing needed for plugin argument

---
 weave | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/weave b/weave
index ab55ed91..08ba1138 100755
--- a/weave
+++ b/weave
@@ -1276,10 +1276,6 @@ launch() {
             --no-restart)
                 RESTART_POLICY=
                 ;;
-            --plugin)
-                PLUGIN_ARGS="--plugin"
-                ENABLE_PLUGIN=1
-                ;;
             *)
                 ARGS="$ARGS '$(echo "$1" | sed "s|'|'\"'\"'|g")'"
                 ;;
@@ -1369,7 +1365,6 @@ launch() {
         --ipalloc-range "$IPRANGE" \
         --dns-effective-listen-address $DOCKER_BRIDGE_IP \
         --dns-listen-address $DOCKER_BRIDGE_IP:53 \
-        $PLUGIN_ARGS \
         --http-addr $HTTP_ADDR \
         --status-addr $STATUS_ADDR \
         --resolv-conf "/var/run/weave/etc/$RESOLV_CONF_BASE" \

From 8ec0e025d30139adfdba0385d706c6e2c7a10d75 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 12 May 2017 13:25:50 +0000
Subject: [PATCH 3/3] Don't need to parse --no-restart twice

---
 weave | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/weave b/weave
index 08ba1138..0551d88d 100755
--- a/weave
+++ b/weave
@@ -1165,9 +1165,6 @@ proxy_parse_args() {
           --tlskey=*)
             tls_arg "${1%%=*}" "${1#*=}" key
             ;;
-          --no-restart)
-            RESTART_POLICY=
-            ;;
           *)
             args="$args $1"
             ;;