proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-10 18:47:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1601 from brauner/2017-05-30/veth_fixes

Browse Source 
network: don't delete net devs we didn't create
This commit is contained in:
Stéphane Graber 2017-05-31 13:17:36 -04:00 committed by GitHub
commit bf3e9c154e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lxc/conf.c
View File

@ -2873,7 +2873,8 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
return 0; return 0;
out_delete: out_delete:
lxc_netdev_delete_by_name(veth1); if (netdev->ifindex != 0)
lxc_netdev_delete_by_name(veth1);
if (!netdev->priv.veth_attr.pair) if (!netdev->priv.veth_attr.pair)
free(veth1); free(veth1);
free(veth2); free(veth2);
@ -3201,7 +3202,7 @@ bool lxc_delete_network(struct lxc_handler *handler)
/* Explicitly delete host veth device to prevent lingering /* Explicitly delete host veth device to prevent lingering
* devices. We had issues in LXD around this. * devices. We had issues in LXD around this.
*/ */
if (netdev->type == LXC_NET_VETH && !am_unpriv()) { if (netdev->ifindex != 0 && netdev->type == LXC_NET_VETH && !am_unpriv()) {
char *hostveth; char *hostveth;
if (netdev->priv.veth_attr.pair) { if (netdev->priv.veth_attr.pair) {
hostveth = netdev->priv.veth_attr.pair; hostveth = netdev->priv.veth_attr.pair;