From: Christian Brauner Date: Mon, 19 Feb 2018 09:23:08 +0000 (+0100) Subject: start: non-functional changes X-Git-Tag: lxc-3.0.0.beta1~22^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46800e7713519ba5e1502c5b2633ad3775693ccd;p=thirdparty%2Flxc.git start: non-functional changes Signed-off-by: Christian Brauner --- diff --git a/src/lxc/start.c b/src/lxc/start.c index 10dfbcb7e..e664087c2 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -721,7 +721,7 @@ int lxc_init(const char *name, struct lxc_handler *handler) ERROR("Failed to set state to \"%s\"", lxc_state2str(STARTING)); goto out_close_maincmd_fd; } - TRACE("set container state to \"STARTING\""); + TRACE("Set container state to \"STARTING\""); /* Start of environment variable setup for hooks. */ if (name) { @@ -934,7 +934,8 @@ void lxc_fini(const char *name, struct lxc_handler *handler) lxc_set_state(name, handler, STOPPED); } - if (run_lxc_hooks(name, "post-stop", handler->conf, NULL)) { + ret = run_lxc_hooks(name, "post-stop", handler->conf, NULL); + if (ret < 0) { ERROR("Failed to run lxc.hook.post-stop for container \"%s\"", name); if (handler->conf->reboot) { WARN("Container will be stopped instead of rebooted"); @@ -1259,7 +1260,6 @@ static int do_start(void *data) if (devnull_fd < 0) { devnull_fd = open_devnull(); - if (devnull_fd < 0) goto out_warn_father; }