Skip to content

Commit

Permalink
conf: non-functional changes
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner authored and stgraber committed Aug 29, 2017
1 parent c3e884b commit a645e06
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/lxc/conf.c
Expand Up @@ -3104,7 +3104,7 @@ bool lxc_delete_network(struct lxc_handler *handler)
}

/* Recent kernel remove the virtual interfaces when the network
* namespace is destroyed but in case we did not moved the
* namespace is destroyed but in case we did not move the
* interface to the network namespace, we have to destroy it
*/
if (netdev->ifindex != 0) {
Expand Down Expand Up @@ -3136,11 +3136,10 @@ bool lxc_delete_network(struct lxc_handler *handler)
if (netdev->priv.veth_attr.pair) {
hostveth = netdev->priv.veth_attr.pair;
ret = lxc_netdev_delete_by_name(hostveth);
if (ret < 0) {
if (ret < 0)
WARN("Failed to remove interface \"%s\" from host: %s.", hostveth, strerror(-ret));
} else {
else
INFO("Removed interface \"%s\" from host.", hostveth);
}
} else if (strlen(netdev->priv.veth_attr.veth1) > 0) {
hostveth = netdev->priv.veth_attr.veth1;
ret = lxc_netdev_delete_by_name(hostveth);
Expand Down

0 comments on commit a645e06

Please sign in to comment.