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 1d8145fcd1a9dff96f1850dcc03e7855ffde94ef..7924ab1ab62ac6c87b337a14c7a15b09597d7bf5 100644 (file)
--- 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 62e38d7a24372adb300339cbd3de40e497b4945d..31f5bb030d0ef5b76b315a0764315deac728ad85 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -669,6 +669,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");