From: Serge Hallyn Date: Mon, 13 Jan 2014 17:08:48 +0000 (-0600) Subject: api change: default container->daemonize to true X-Git-Tag: lxc-1.0.0.beta2~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8ad5f4623bb5e61b1065047a22b90182daa2e66;p=thirdparty%2Flxc.git api change: default container->daemonize to true Pretty much the only case where we do NOT want to daemonize a container start is lxc-start. So make c->daemonize true by default, and have lxc-start set it to false. If there are existing API users who rely on daemonize by default, then they will be broken by this. It seems we should do this before beta1 if we're going to do it. Signed-off-by: Serge Hallyn Acked-by: Stéphane Graber --- diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c index e6ca35558..d5379daf7 100644 --- a/src/lxc/lxc_start.c +++ b/src/lxc/lxc_start.c @@ -325,8 +325,8 @@ int main(int argc, char *argv[]) conf->inherit_ns_fd[i] = fd; } - if (my_args.daemonize) { - c->want_daemonize(c, true); + if (!my_args.daemonize) { + c->want_daemonize(c, false); } if (pid_fp != NULL) { diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index e5534158e..8462ba581 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -3052,6 +3052,7 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath lxcapi_destroy(c); lxcapi_clear_config(c); } + c->daemonize = true; // assign the member functions c->is_defined = lxcapi_is_defined; diff --git a/src/tests/startone.c b/src/tests/startone.c index 678f62e6b..93992c1fc 100644 --- a/src/tests/startone.c +++ b/src/tests/startone.c @@ -168,6 +168,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "%d: failed to get extra ref to container\n", __LINE__); exit(1); } + c->want_daemonize(false); pid_t pid = fork(); if (pid < 0) { fprintf(stderr, "%d: fork failed\n", __LINE__);