]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxc: move lxc_unlink_nsgroup out of lxc_fini
authorMichel Normand <normand@fr.ibm.com>
Thu, 29 Apr 2010 08:03:59 +0000 (10:03 +0200)
committerDaniel Lezcano <dlezcano@fr.ibm.com>
Thu, 29 Apr 2010 08:03:59 +0000 (10:03 +0200)
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>
src/lxc/start.c

index 6242296b973c1cf47c98013018b0dd790986f359..cd2b237f891f8c4fd057fd765267e79f9400ca8a 100644 (file)
@@ -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;