[lxc-devel] [lxc/master] network: Fixes vlan hook script

[tomponline on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 423 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190429/09197edc/attachment.bin>
-------------- next part --------------
From 19abca58e2d910dab7adefd104623b09d4ada699 Mon Sep 17 00:00:00 2001
From: tomponline <thomas.parrott at canonical.com>
Date: Mon, 29 Apr 2019 09:44:57 +0100
Subject: [PATCH] network: Fixes vlan hook script

Signed-off-by: tomponline <thomas.parrott at canonical.com>
---
 src/lxc/network.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lxc/network.c b/src/lxc/network.c
index b49aae68cb..0898686331 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -307,9 +307,10 @@ static int instantiate_vlan(struct lxc_handler *handler, struct lxc_netdev *netd
 		err = run_script_argv(handler->name,
 				handler->conf->hooks_version, "net",
 				netdev->upscript, "up", argv);
-		if (err < 0)
+		if (err < 0) {
 			lxc_netdev_delete_by_name(peer);
 			return -1;
+		}
 	}
 
 	DEBUG("Instantiated vlan \"%s\" with ifindex is \"%d\" (vlan1000)",