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>

api change: default container->daemonize to true
c8ad5f46 · Serge Hallyn · Stéphane Graber · 4213a747 · c8ad5f46 · c8ad5f46
Commit c8ad5f46 authored Jan 13, 2014 by Serge Hallyn Committed by Stéphane Graber Jan 14, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

lxc_start.c src/lxc/lxc_start.c +2 -2

lxccontainer.c src/lxc/lxccontainer.c +1 -0

startone.c src/tests/startone.c +1 -0

No files found.
--- 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) {
+	if (!my_args.daemonize) {
-		c->want_daemonize(c, true);
+		c->want_daemonize(c, false);
 	}
 	if (pid_fp != NULL) {

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

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