From: Rodrigo Vaz <rodrigo@heroku.com>
Date: Thu, 3 Jul 2014 18:39:51 +0000 (-0300)
Subject: make the container exit code propagate to lxc-start exit code when appropriate
X-Git-Tag: lxc-1.1.0.alpha1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4ef230cc9b86343b1f69d5e23711f3626305873;p=thirdparty%2Flxc.git

make the container exit code propagate to lxc-start exit code when appropriate

Signed-off-by: Rodrigo Sampaio Vaz <rodrigo@heroku.com>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index 1d8145fcd..7924ab1ab 100644
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -336,6 +336,9 @@ int main(int argc, char *argv[])
 			ERROR("To get more details, run the container in foreground mode.");
 		ERROR("Additional information can be obtained by setting the "
 		      "--logfile and --log-priority options.");
+		err = c->error_num;
+		lxc_container_put(c);
+		return err;
 	}
 
 out:
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index b8eacc1d7..103309caa 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -673,6 +673,7 @@ static bool lxcapi_start(struct lxc_container *c, int useinit, char * const argv
 reboot:
 	conf->reboot = 0;
 	ret = lxc_start(c->name, argv, conf, c->config_path);
+	c->error_num = ret;
 
 	if (conf->reboot) {
 		INFO("container requested reboot");