From 73654791c1dc391ae58a5667f20046c627d8df6f Mon Sep 17 00:00:00 2001
From: Stevie Johnstone <stevie@jazznetworks.com>
Date: Mon, 9 Jul 2018 10:33:04 +0100
Subject: [PATCH] Issue #3337: fix upgrade_cni_plugin

---
 weave | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index 8490832b..56b42719 100755
--- a/weave
+++ b/weave
@@ -707,10 +707,10 @@ upgrade_cni_plugin() {
 
     # Create two symlinks to the plugin, as it has different
     # behaviour depending on its name:
-    if [ "$(readlink -f $1/weave-net)" != "$CNI_PLUGIN_NAME" ]; then
+    if [ "$(readlink -f $1/weave-net)" != "$1/$CNI_PLUGIN_NAME" ]; then
         upgrade_cni_plugin_symlink $1 weave-net
     fi
-    if [ "$(readlink -f $1/weave-ipam)" != "$CNI_PLUGIN_NAME" ]; then
+    if [ "$(readlink -f $1/weave-ipam)" != "$1/$CNI_PLUGIN_NAME" ]; then
         upgrade_cni_plugin_symlink $1 weave-ipam
     fi
 }