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 <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Serge Hallyn 2014-01-13 11:08:48 -06:00 committed by Stéphane Graber
parent 4213a747e8
commit c8ad5f4623
3 changed files with 4 additions and 2 deletions

View File

@ -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) {

View File

@ -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;

View File

@ -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__);