From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Fri, 7 Sep 2012 16:14:04 +0000 (-0500)
Subject: dual-fork for daemonized fork in lxcapi-start
X-Git-Tag: lxc-0.9.0.alpha1~1^2~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=697fa6390c5d52eaef36a15c31b68d093a0d0941;p=thirdparty%2Flxc.git

dual-fork for daemonized fork in lxcapi-start

So the container will be reparented by init.  Otherwise children of the
lxc-start might be reaped by python3 rather than lxc-start.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index c8dc8c483..ea39710b3 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -265,8 +265,15 @@ static bool lxcapi_wait(struct lxc_container *c, char *state, int timeout)
 static bool wait_on_daemonized_start(struct lxc_container *c)
 {
 	/* we'll probably want to make this timeout configurable? */
-	int timeout = 5;
+	int timeout = 5, ret, status;
 
+	/*
+	 * our child is going to fork again, then exit.  reap the
+	 * child
+	 */
+	ret = wait(&status);
+	if (ret == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0)
+		DEBUG("failed waiting for first dual-fork child");
 	return lxcapi_wait(c, "RUNNING", timeout);
 }
 
@@ -325,6 +332,14 @@ static bool lxcapi_start(struct lxc_container *c, int useinit, char ** argv)
 		}
 		if (pid != 0)
 			return wait_on_daemonized_start(c);
+		/* second fork to be reparented by init */
+		pid = fork();
+		if (pid < 0) {
+			SYSERROR("Error doing dual-fork");
+			return false;
+		}
+		if (pid != 0)
+			exit(0);
 		/* like daemon(), chdir to / and redirect 0,1,2 to /dev/null */
 		if (chdir("/")) {
 			SYSERROR("Error chdir()ing to /.");