daemonized start: exit children on failure, don't return

When starting a daemonized container, only the original parent thread should return to the caller. The first forked child immediately exits after forking, but the grandparent child was in some places returning on error - causing a second instance of the calling function. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Tycho Andersen <tycho.andersen@canonical.com>

daemonized start: exit children on failure, don't return
13353dc4 · Serge Hallyn · 2badf64b · 13353dc4
Commit 13353dc4 authored Jun 10, 2015 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

lxccontainer.c src/lxc/lxccontainer.c +7 -3

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -712,19 +712,19 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
 		pid = fork();
 		if (pid < 0) {
 			SYSERROR("Error doing dual-fork");
-			return false;
+			exit(1);
 		}
 		if (pid != 0)
 			exit(0);
 		/* like daemon(), chdir to / and redirect 0,1,2 to /dev/null */
 		if (chdir("/")) {
 			SYSERROR("Error chdir()ing to /.");
-			return false;
+			exit(1);
 		}
 		lxc_check_inherited(conf, true, -1);
 		if (null_stdfds() < 0) {
 			ERROR("failed to close fds");
-			return false;
+			exit(1);
 		}
 		setsid();
 	} else {
@@ -742,6 +742,8 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
 		if (pid_fp == NULL) {
 			SYSERROR("Failed to create pidfile '%s' for '%s'",
 				 c->pidfile, c->name);
+			if (daemonize)
+				exit(1);
 			return false;
 		}

@@ -749,6 +751,8 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
 			SYSERROR("Failed to write '%s'", c->pidfile);
 			fclose(pid_fp);
 			pid_fp = NULL;
+			if (daemonize)
+				exit(1);
 			return false;
 		}