The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3417
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From 9f8cf6e1102562e20ece76fa7b656bff62d59038 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Mon, 18 May 2020 17:11:26 +0200
Subject: [PATCH] network: fix {mac,ip,v}lan device creation
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
src/lxc/network.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/lxc/network.c b/src/lxc/network.c
index ef6707ff4c..5845a5c13f 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -482,6 +482,8 @@ static int instantiate_macvlan(struct lxc_handler *handler,
struct lxc_netdev *n
goto on_error;
}
+ strlcpy(netdev->created_name, peer, IFNAMSIZ);
+
netdev->ifindex = if_nametoindex(peer);
if (!netdev->ifindex) {
ERROR("Failed to retrieve ifindex for \"%s\"", peer);
@@ -3115,9 +3117,9 @@ int lxc_network_move_created_netdev_priv(struct
lxc_handler *handler)
physname = is_wlan(netdev->link);
if (physname)
- ret = lxc_netdev_move_wlan(physname, netdev->link, pid,
netdev->name);
+ ret = lxc_netdev_move_wlan(physname, netdev->link, pid,
NULL);
else
- ret = lxc_netdev_move_by_index(netdev->ifindex, pid,
netdev->name);
+ ret = lxc_netdev_move_by_index(netdev->ifindex, pid,
NULL);
if (ret)
return log_error_errno(-1, -ret, "Failed to move
network device \"%s\" with ifindex %d to network namespace %d",
netdev->created_name,
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
