diff options
Diffstat (limited to 'recipes-containers/lxc/files/lxc-0.9.0-setup_netdev-re-read-ifindex-in-LXC_NET_PHYS-case.patch')
| -rw-r--r-- | recipes-containers/lxc/files/lxc-0.9.0-setup_netdev-re-read-ifindex-in-LXC_NET_PHYS-case.patch | 49 | 
1 files changed, 0 insertions, 49 deletions
diff --git a/recipes-containers/lxc/files/lxc-0.9.0-setup_netdev-re-read-ifindex-in-LXC_NET_PHYS-case.patch b/recipes-containers/lxc/files/lxc-0.9.0-setup_netdev-re-read-ifindex-in-LXC_NET_PHYS-case.patch deleted file mode 100644 index 767e3894..00000000 --- a/recipes-containers/lxc/files/lxc-0.9.0-setup_netdev-re-read-ifindex-in-LXC_NET_PHYS-case.patch +++ /dev/null  | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | From 8712c58ab896f072cf95e3ffa3ceac1fa10f6295 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bogdan Purcareata <bogdan.purcareata@freescale.com> | ||
| 3 | Date: Thu, 14 Nov 2013 12:31:55 +0200 | ||
| 4 | Subject: [PATCH] setup_netdev: re-read ifindex in LXC_NET_PHYS case | ||
| 5 | |||
| 6 | When moving an interface from the host netns to a container's, | ||
| 7 | the ifindex might not remain the same. This happens when the | ||
| 8 | index of the host interface is already assigned to another interface | ||
| 9 | in the new netns. | ||
| 10 | |||
| 11 | For veth/vlan/macvlan, virtual interfaces are first created on the host, | ||
| 12 | and then moved in the container. Since they are created after all other | ||
| 13 | interfaces are discovered, there is no chance for its assigned ifindex | ||
| 14 | to be already present in a freshly created netns, since its a greater | ||
| 15 | number. | ||
| 16 | |||
| 17 | However, when moving a physical interface, there is a chance that its | ||
| 18 | ifindex in the host netns is not free in the new netns. The patch | ||
| 19 | forces ifindex re-read for the LXC_NET_PHYS case to update the | ||
| 20 | lxc_netdev structure. | ||
| 21 | |||
| 22 | Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> | ||
| 23 | Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> | ||
| 24 | --- | ||
| 25 | src/lxc/conf.c | 8 ++++++++ | ||
| 26 | 1 file changed, 8 insertions(+) | ||
| 27 | |||
| 28 | diff --git a/src/lxc/conf.c b/src/lxc/conf.c | ||
| 29 | index 6b3f318..08b0d0f 100644 | ||
| 30 | --- a/src/lxc/conf.c | ||
| 31 | +++ b/src/lxc/conf.c | ||
| 32 | @@ -1846,6 +1846,14 @@ static int setup_netdev(struct lxc_netdev *netdev) | ||
| 33 | return 0; | ||
| 34 | } | ||
| 35 | |||
| 36 | + /* get the new ifindex in case of physical netdev */ | ||
| 37 | + if (netdev->type == LXC_NET_PHYS) | ||
| 38 | + if (!(netdev->ifindex = if_nametoindex(netdev->link))) { | ||
| 39 | + ERROR("failed to get ifindex for %s", | ||
| 40 | + netdev->link); | ||
| 41 | + return -1; | ||
| 42 | + } | ||
| 43 | + | ||
| 44 | /* retrieve the name of the interface */ | ||
| 45 | if (!if_indextoname(netdev->ifindex, current_ifname)) { | ||
| 46 | ERROR("no interface corresponding to index '%d'", | ||
| 47 | -- | ||
| 48 | 1.7.11.7 | ||
| 49 | |||
