]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
tests: daemonize in startone
authorStéphane Graber <stgraber@ubuntu.com>
Thu, 13 Mar 2014 14:16:34 +0000 (10:16 -0400)
committerStéphane Graber <stgraber@ubuntu.com>
Thu, 13 Mar 2014 15:31:22 +0000 (11:31 -0400)
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>
src/tests/startone.c

index b5056e165af4038ce5b1fa8927f5cfef231d80ac..9dd4ec3e61c0d39bed5b8cbb172bcf7f4f8e7246 100644 (file)
@@ -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);