From bfd500733912bbaa55594d1951f52a369ca617d7 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 18 Sep 2014 11:03:06 +0100
Subject: [PATCH] Don't test if symlink exists before 'rm -f' When the
 symlink's target doesn't exist, '[ -f' is false, so the symlink doesn't get
 removed. Since we do always want it to be removed, just call 'rm -f' anyway,
 which won't complain if the file doesn't exist.

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

diff --git a/weaver/weave b/weaver/weave
index b7fa02d7..7aa4d14d 100755
--- a/weaver/weave
+++ b/weaver/weave
@@ -114,7 +114,7 @@ configure_container_networking() {
     NSPID=$DOCKERPID
 
     [ ! -d /var/run/netns ] && mkdir -p /var/run/netns
-    [ -f /var/run/netns/$NSPID ] && rm -f /var/run/netns/$NSPID
+    rm -f /var/run/netns/$NSPID
     ln -s /proc/$NSPID/ns/net /var/run/netns/$NSPID
 
     EXITCODE=1
@@ -136,7 +136,7 @@ configure_container_networking() {
         fi
     fi
 
-    [ -f /var/run/netns/$NSPID ] && rm -f /var/run/netns/$NSPID
+    rm -f /var/run/netns/$NSPID
 
     return $EXITCODE
 }