The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3419
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) === Fixes: https://lists.linuxcontainers.org/pipermail/lxc-users/2020-May/015245.html Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From 9d0406c79dd19a76b0974910855f4a1d6e87b70e Mon Sep 17 00:00:00 2001 From: Christian Brauner <christian.brau...@ubuntu.com> Date: Tue, 19 May 2020 09:09:24 +0200 Subject: [PATCH] network: use __instantiate_ns_common() in instantiate_ns_phys() too Fixes: https://lists.linuxcontainers.org/pipermail/lxc-users/2020-May/015245.html Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com> --- src/lxc/network.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/lxc/network.c b/src/lxc/network.c index 5845a5c13f..da09141dd6 100644 --- a/src/lxc/network.c +++ b/src/lxc/network.c @@ -860,7 +860,7 @@ static instantiate_cb netdev_conf[LXC_NET_MAXCONFTYPE + 1] = { [LXC_NET_NONE] = instantiate_none, }; -static int __instantiate_common(struct lxc_netdev *netdev) +static int __instantiate_ns_common(struct lxc_netdev *netdev) { char current_ifname[IFNAMSIZ]; @@ -905,33 +905,27 @@ static int __instantiate_common(struct lxc_netdev *netdev) static int instantiate_ns_veth(struct lxc_netdev *netdev) { - return __instantiate_common(netdev); + return __instantiate_ns_common(netdev); } static int instantiate_ns_macvlan(struct lxc_netdev *netdev) { - return __instantiate_common(netdev); + return __instantiate_ns_common(netdev); } static int instantiate_ns_ipvlan(struct lxc_netdev *netdev) { - return __instantiate_common(netdev); + return __instantiate_ns_common(netdev); } static int instantiate_ns_vlan(struct lxc_netdev *netdev) { - return __instantiate_common(netdev); + return __instantiate_ns_common(netdev); } static int instantiate_ns_phys(struct lxc_netdev *netdev) { - netdev->ifindex = if_nametoindex(netdev->name); - if (!netdev->ifindex) - return log_error_errno(-1, errno, - "Failed to retrieve ifindex for network device with name %s", - netdev->name); - - return 0; + return __instantiate_ns_common(netdev); } static int instantiate_ns_empty(struct lxc_netdev *netdev)
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel
