From afc6f49e800f6a067233bb0d4121f76eea29fef8 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Wed, 13 Jul 2016 10:20:54 +0100
Subject: [PATCH] mount CNI_NETNS dir, in case it is some exotic location

Fixes #2394
---
 weave | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weave b/weave
index 7bb3a69c..2726f98f 100755
--- a/weave
+++ b/weave
@@ -1031,9 +1031,12 @@ peer_args() {
 create_cni_script() {
     cat >"$1" <<EOF
 #!/bin/sh
+[ -z "\$CNI_NETNS" -o \$(echo "\$CNI_NETNS" | grep "^/proc/") ] || \\
+    EXTRA_VOLUMES="-v \$(dirname \$CNI_NETNS):\$(dirname \$CNI_NETNS)"
 docker run --rm $(docker_run_options) --pid=host -i \\
  -e CNI_VERSION -e CNI_COMMAND -e CNI_CONTAINERID -e CNI_NETNS \\
- -e CNI_IFNAME -e CNI_ARGS -e CNI_PATH -v /etc/cni:/etc/cni -v /opt/cni:/opt/cni \\
+ -e CNI_IFNAME -e CNI_ARGS -e CNI_PATH \\
+ -v /etc/cni:/etc/cni -v /opt/cni:/opt/cni \$EXTRA_VOLUMES \\
  $PLUGIN_IMAGE $COVERAGE_ARGS $2
 EOF
     chmod a+x "$1"