From: Michel Normand <normand@fr.ibm.com>
Date: Thu, 29 Apr 2010 08:03:59 +0000 (+0200)
Subject: lxc: move lxc_unlink_nsgroup out of lxc_fini
X-Git-Tag: lxc-0.7.0~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d2e2ec66c9fadd4aea0090475cbf87e1b42c1a0;p=thirdparty%2Flxc.git

lxc: move lxc_unlink_nsgroup out of lxc_fini

to be able to have lxc_fini symetric with lxc_init

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 6242296b9..cd2b237f8 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -347,7 +347,6 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
 	 */
 	lxc_set_state(name, handler, STOPPING);
 	lxc_set_state(name, handler, STOPPED);
-	lxc_unlink_nsgroup(name);
 
 	lxc_delete_console(&handler->conf->console);
 	lxc_delete_tty(&handler->conf->tty_info);
@@ -569,6 +568,7 @@ int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf)
 
 	err =  lxc_error_set_and_log(handler->pid, status);
 out_fini:
+	lxc_unlink_nsgroup(name);
 	lxc_fini(name, handler);
 	return err;