Merge pull request #2932 from weaveworks/issues/fix-protect-against-docker-hang

Fix protect_against_docker_hang

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
 }