Skip to content

L
lxc
Unverified Commit df7d58b7 by Christian Brauner Committed by Stéphane Graber
Options

network: restore old behavior

I introduced a regression: when users didn't specify a specific name via lxc.net.<idx>.name then the device would retain the random name it received when we created it. Before we would use the "eth%d" syntax to get the kernel to assign a fixed name. Restore that behavior. Closes: #3407. Fixes: 8bf64b77 ("network: rework network device creation") Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 7ebcd704
Showing with 10 additions and 15 deletions
src/lxc/network.c
...@@ -482,10 +482,6 @@ static int instantiate_macvlan(struct lxc_handler *handler, struct lxc_netdev *n ...@@ -482,10 +482,6 @@ static int instantiate_macvlan(struct lxc_handler *handler, struct lxc_netdev *n
goto on_error; goto on_error;
} }
strlcpy(netdev->created_name, peer, IFNAMSIZ);
if (is_empty_string(netdev->name))
(void)strlcpy(netdev->name, peer, IFNAMSIZ);
netdev->ifindex = if_nametoindex(peer); netdev->ifindex = if_nametoindex(peer);
if (!netdev->ifindex) { if (!netdev->ifindex) {
ERROR("Failed to retrieve ifindex for \"%s\"", peer); ERROR("Failed to retrieve ifindex for \"%s\"", peer);
...@@ -634,8 +630,6 @@ static int instantiate_ipvlan(struct lxc_handler *handler, struct lxc_netdev *ne ...@@ -634,8 +630,6 @@ static int instantiate_ipvlan(struct lxc_handler *handler, struct lxc_netdev *ne
} }
strlcpy(netdev->created_name, peer, IFNAMSIZ); strlcpy(netdev->created_name, peer, IFNAMSIZ);
if (is_empty_string(netdev->name))
(void)strlcpy(netdev->name, peer, IFNAMSIZ);
netdev->ifindex = if_nametoindex(peer); netdev->ifindex = if_nametoindex(peer);
if (!netdev->ifindex) { if (!netdev->ifindex) {
...@@ -709,8 +703,6 @@ static int instantiate_vlan(struct lxc_handler *handler, struct lxc_netdev *netd ...@@ -709,8 +703,6 @@ static int instantiate_vlan(struct lxc_handler *handler, struct lxc_netdev *netd
} }
strlcpy(netdev->created_name, peer, IFNAMSIZ); strlcpy(netdev->created_name, peer, IFNAMSIZ);
if (is_empty_string(netdev->name))
(void)strlcpy(netdev->name, peer, IFNAMSIZ);
netdev->ifindex = if_nametoindex(peer); netdev->ifindex = if_nametoindex(peer);
if (!netdev->ifindex) { if (!netdev->ifindex) {
...@@ -866,7 +858,7 @@ static instantiate_cb netdev_conf[LXC_NET_MAXCONFTYPE + 1] = { ...@@ -866,7 +858,7 @@ static instantiate_cb netdev_conf[LXC_NET_MAXCONFTYPE + 1] = {
[LXC_NET_NONE] = instantiate_none, [LXC_NET_NONE] = instantiate_none,
}; };
static int instantiate_ns_veth(struct lxc_netdev *netdev) static int __instantiate_common(struct lxc_netdev *netdev)
{ {
char current_ifname[IFNAMSIZ]; char current_ifname[IFNAMSIZ];
...@@ -908,13 +900,10 @@ static int instantiate_ns_veth(struct lxc_netdev *netdev) ...@@ -908,13 +900,10 @@ static int instantiate_ns_veth(struct lxc_netdev *netdev)
return 0; return 0;
} }
static int __instantiate_common(struct lxc_netdev *netdev) static int instantiate_ns_veth(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_common(netdev);
} }
static int instantiate_ns_macvlan(struct lxc_netdev *netdev) static int instantiate_ns_macvlan(struct lxc_netdev *netdev)
...@@ -934,7 +923,13 @@ static int instantiate_ns_vlan(struct lxc_netdev *netdev) ...@@ -934,7 +923,13 @@ static int instantiate_ns_vlan(struct lxc_netdev *netdev)
static int instantiate_ns_phys(struct lxc_netdev *netdev) static int instantiate_ns_phys(struct lxc_netdev *netdev)
{ {
return __instantiate_common(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;
} }
static int instantiate_ns_empty(struct lxc_netdev *netdev) static int instantiate_ns_empty(struct lxc_netdev *netdev)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment