inittab: don't close fds unconditionally since this breaks UML

[project/procd.git] / inittab.c

diff --git a/inittab.c b/inittab.c
index d7bb35b..623103d 100644 (file)
--- a/inittab.c
+++ b/inittab.c
@@ -14,6 +14,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -96,16 +97,21 @@ static void fork_worker(struct init_action *a)
 
        a->proc.pid = fork();
        if (!a->proc.pid) {
-               p = setsid( );
+               p = setsid();
+
                fd = dev_open(a->id);
                if (fd != -1)
                {
                        dup2(fd, STDIN_FILENO);
                        dup2(fd, STDOUT_FILENO);
                        dup2(fd, STDERR_FILENO);
-                       tcsetpgrp(fd, p);
-                       close(fd);
+                       if (fd > STDERR_FILENO)
+                               close(fd);
                }
+
+               ioctl(STDIN_FILENO, TIOCSCTTY, 1);
+               tcsetpgrp(STDIN_FILENO, p);
+
                execvp(a->argv[0], a->argv);
                ERROR("Failed to execute %s\n", a->argv[0]);
                exit(-1);
@@ -176,18 +182,23 @@ static void askconsole(struct init_action *a)
                split = strchr(tty, ',');
                if (split != NULL)
                        *split = '\0';
-       }
 
-       if (!dev_exist(tty)) {
-               DEBUG(4, "skipping %s\n", tty);
-               return;
+               if (!dev_exist(tty)) {
+                       DEBUG(4, "skipping %s\n", tty);
+                       return;
+               }
+
+               console = strdup(tty);
+               a->id = strdup(tty);
+       }
+       else {
+               console = NULL;
+               a->id = NULL;
        }
-       console = strdup(tty);
 
        a->tout.cb = respawn;
        for (i = MAX_ARGS - 1; i >= 1; i--)
                a->argv[i] = a->argv[i - 1];
-       a->id = strdup(tty);
        a->argv[0] = ask;
        a->respawn = 500;