From b8f475c017d0ecb33cebeacf0564256f9584ef4d Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Thu, 12 Dec 2013 12:12:06 -0600 Subject: [PATCH] don't run lxc-user-nic for empty netns Signed-off-by: Serge Hallyn --- src/lxc/conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lxc/conf.c b/src/lxc/conf.c index 0beb12bb2..7228ebe47 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -3036,15 +3036,15 @@ int lxc_assign_network(struct lxc_list *network, pid_t pid) netdev = iterator->elem; + /* empty network namespace, nothing to move */ + if (!netdev->ifindex) + continue; if (!am_root) { if (unpriv_assign_nic(netdev, pid)) return -1; // TODO fill in netdev->ifindex and name continue; } - /* empty network namespace, nothing to move */ - if (!netdev->ifindex) - continue; err = lxc_netdev_move_by_index(netdev->ifindex, pid); if (err) {