Commit 4d2e2ec6 by Michel Normand Committed by Daniel Lezcano

lxc: move lxc_unlink_nsgroup out of lxc_fini

to be able to have lxc_fini symetric with lxc_init Signed-off-by: 's avatarMichel Normand <normand@fr.ibm.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 99a6af52
...@@ -347,7 +347,6 @@ void lxc_fini(const char *name, struct lxc_handler *handler) ...@@ -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, STOPPING);
lxc_set_state(name, handler, STOPPED); lxc_set_state(name, handler, STOPPED);
lxc_unlink_nsgroup(name);
lxc_delete_console(&handler->conf->console); lxc_delete_console(&handler->conf->console);
lxc_delete_tty(&handler->conf->tty_info); lxc_delete_tty(&handler->conf->tty_info);
...@@ -569,6 +568,7 @@ int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf) ...@@ -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); err = lxc_error_set_and_log(handler->pid, status);
out_fini: out_fini:
lxc_unlink_nsgroup(name);
lxc_fini(name, handler); lxc_fini(name, handler);
return err; return err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment