proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-13 22:12:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix network cleanup on error

Browse Source 
Network cleanup does not cleanup correctly the virtual interfaces
in case of an error.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Daniel Lezcano 2012-01-05 22:45:32 +01:00
parent f0e64b8b66
commit d8f8e35202
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/conf.c
View File

@ -1702,13 +1702,19 @@ void lxc_delete_network(struct lxc_list *network)
if (netdev->ifindex == 0)
continue;
/* Recent kernels already delete the virtual devices */
if (netdev->type != LXC_NET_PHYS)
if (netdev->type == LXC_NET_PHYS) {
if (lxc_netdev_rename_by_index(netdev->ifindex, netdev->link))
WARN("failed to rename to the initial name the " \
"netdev '%s'", netdev->link);
continue;
}
if (lxc_netdev_rename_by_index(netdev->ifindex, netdev->link))
WARN("failed to rename to the initial name the netdev '%s'",
netdev->link);
/* Recent kernel remove the virtual interfaces when the network
* namespace is destroyed but in case we did not moved the
* interface to the network namespace, we have to destroy it
*/
if (lxc_netdev_delete_by_index(netdev->ifindex))
WARN("failed to remove interface '%s'", netdev->name);
}
}

1
src/lxc/start.c
View File

@ -490,7 +490,6 @@ int lxc_spawn(struct lxc_handler *handler)
}
}
/* Create a process in a new set of namespaces */
handler->pid = lxc_clone(do_start, handler, clone_flags);
if (handler->pid < 0) {