[lxc-devel] [lxd/master] container/lxc: fixes return value of detachInterfaceRename

[tomponline on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 361 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190711/2d8e790b/attachment.bin>
-------------- next part --------------
From c1aa7cae9e58c9a80c493a88b3e7acba2de5d679 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parrott at canonical.com>
Date: Thu, 11 Jul 2019 20:17:52 +0100
Subject: [PATCH] container/lxc: fixes return value of detachInterfaceRename

Signed-off-by: Thomas Parrott <thomas.parrott at canonical.com>
---
 lxd/container_lxc.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
index 9f9f506189..32ea68c698 100644
--- a/lxd/container_lxc.go
+++ b/lxd/container_lxc.go
@@ -2744,7 +2744,7 @@ func (c *containerLXC) detachInterfaceRename(netns string, ifName string, hostNa
 
 	// Process forknet detach response
 	if err != nil {
-		logger.Error("Error calling 'lxd forknet detach", log.Ctx{"container": c.name, "output": out, "netns": netns, "ifName": ifName, "hostName": hostName, "pid": lxdPID})
+		return errors.Wrapf(err, "%v", out)
 	}
 
 	return nil