From f94948d8ecadaf10af2fb109ca2a475bf090db71 Mon Sep 17 00:00:00 2001
From: Mrunal Patel <mrunalp@gmail.com>
Date: Sun, 25 Feb 2018 20:16:00 -0800
Subject: [PATCH] Add context to net ns symlink removal errors

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
---
 lib/sandbox/sandbox.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/sandbox/sandbox.go b/lib/sandbox/sandbox.go
index 0b590586..74485198 100644
--- a/lib/sandbox/sandbox.go
+++ b/lib/sandbox/sandbox.go
@@ -59,10 +59,14 @@ func (ns *NetNs) symlinkCreate(name string) error {
 
 func (ns *NetNs) symlinkRemove() error {
 	if err := ns.symlink.Close(); err != nil {
-		return err
+		return fmt.Errorf("failed to close net ns symlink: %v", err)
 	}
 
-	return os.RemoveAll(ns.symlink.Name())
+	if err := os.RemoveAll(ns.symlink.Name()); err != nil {
+		return fmt.Errorf("failed to remove net ns symlink: %v", err)
+	}
+
+	return nil
 }
 
 func isSymbolicLink(path string) (bool, error) {