Commit c4c3f631 by Rodrigo Vaz Committed by Stéphane Graber

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

parent a8fe4754
...@@ -336,6 +336,9 @@ int main(int argc, char *argv[]) ...@@ -336,6 +336,9 @@ int main(int argc, char *argv[])
ERROR("To get more details, run the container in foreground mode."); ERROR("To get more details, run the container in foreground mode.");
ERROR("Additional information can be obtained by setting the " ERROR("Additional information can be obtained by setting the "
"--logfile and --log-priority options."); "--logfile and --log-priority options.");
err = c->error_num;
lxc_container_put(c);
return err;
} }
out: out:
......
...@@ -669,6 +669,7 @@ static bool lxcapi_start(struct lxc_container *c, int useinit, char * const argv ...@@ -669,6 +669,7 @@ static bool lxcapi_start(struct lxc_container *c, int useinit, char * const argv
reboot: reboot:
conf->reboot = 0; conf->reboot = 0;
ret = lxc_start(c->name, argv, conf, c->config_path); ret = lxc_start(c->name, argv, conf, c->config_path);
c->error_num = ret;
if (conf->reboot) { if (conf->reboot) {
INFO("container requested reboot"); INFO("container requested reboot");
......
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