From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 13 Mar 2014 14:16:34 +0000 (-0400)
Subject: tests: daemonize in startone
X-Git-Tag: lxc-1.1.0.alpha1~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fd0838c69ce3fea6eda93b1a9d8697ac95d65df;p=thirdparty%2Flxc.git

tests: daemonize in startone

This should finally silence this test for good :)

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/tests/startone.c b/src/tests/startone.c
index b5056e165..9dd4ec3e6 100644
--- a/src/tests/startone.c
+++ b/src/tests/startone.c
@@ -163,24 +163,11 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "%d: failed to get extra ref to container\n", __LINE__);
 		exit(1);
 	}
-	c->want_daemonize(c, false);
-	pid_t pid = fork();
-	if (pid < 0) {
-		fprintf(stderr, "%d: fork failed\n", __LINE__);
-		goto out;
-	}
-	if (pid == 0) {
-		close(0);
-		close(1);
-		close(2);
-		open("/dev/zero", O_RDONLY);
-		open("/dev/null", O_RDWR);
-		open("/dev/null", O_RDWR);
-		b = c->startl(c, 0, NULL);
-		if (!b)
-			fprintf(stderr, "%d: %s failed to start\n", __LINE__, c->name);
-		lxc_container_put(c);
-		exit(!b);
+
+	c->want_daemonize(c, true);
+	if (!c->startl(c, 0, NULL)) {
+		fprintf(stderr, "%d: %s failed to start\n", __LINE__, c->name);
+		exit(1);
 	}
 
 	sleep(3);