From a497e1ab8ac43a741620b0464a4dbb62e5158f23 Mon Sep 17 00:00:00 2001
From: Martynas Pumputis <martynasp@gmail.com>
Date: Fri, 5 May 2017 17:14:50 +0100
Subject: [PATCH] Fix protect_against_docker_hang

Check not only for plugin-v2 but also for plugin-v1, as both
create the same plugin sockets (weave.sock and weavemesh.sock).
---
 weave | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weave b/weave
index 41ab70be..5dea727b 100755
--- a/weave
+++ b/weave
@@ -1442,7 +1442,7 @@ stop_proxy() {
 
 protect_against_docker_hang() {
     # If the plugin is not running, remove its socket so Docker doesn't try to talk to it
-    if ! is_plugin_v2_enabled 2>/dev/null ; then
+    if [ ! is_plugin_v1_enabled ] && [ ! is_plugin_v2_enabled ] ; then
         rm -f $HOST_ROOT/run/docker/plugins/weave.sock $HOST_ROOT/run/docker/plugins/weavemesh.sock
     fi
 }