diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-10-12 04:05:48 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-10-12 04:05:48 +0000 |
| commit | e8a90fb2bcdd09159455fcafc94428e31cbe9670 (patch) | |
| tree | 560843b486aaee0d308cf58cf53ef23ed6bba5ad | |
| parent | 71ae64bdc6b044eef0a9f3bebd85cc4a6b67362f (diff) | |
After thinking about it, I think this patch from Matt Kraai is probably the
best way to go. Sysvinit does not provide a controlling tty since it doesn't
even try to open ttys for apps. We do. So we should _try_ to provide a
controlling tty if possible, but we needn't freak out if it doesn't work. This
way we won't need to use openvt or similar, we'll just have init do the Right
Thing(tm).
| -rw-r--r-- | init/init.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/init/init.c b/init/init.c index edbd90bfe..ec1bacc83 100644 --- a/init/init.c +++ b/init/init.c @@ -501,12 +501,11 @@ static pid_t run(struct init_action *a) signal(SIGTSTP, SIG_DFL); /* Create a new session and make ourself the process - * group leader for non-interactive jobs */ - if ((a->action & (RESPAWN)) == 0) - setsid(); + * group leader */ + setsid(); /* Open the new terminal device */ - if ((device_open(a->terminal, O_RDWR | O_NOCTTY)) < 0) { + if ((device_open(a->terminal, O_RDWR)) < 0) { if (stat(a->terminal, &sb) != 0) { message(LOG | CONSOLE, "\rdevice '%s' does not exist.\n", a->terminal); @@ -516,10 +515,6 @@ static pid_t run(struct init_action *a) _exit(1); } - /* Non-interactive jobs should not get a controling tty */ - if ((a->action & (RESPAWN)) == 0) - (void) ioctl(0, TIOCSCTTY, 0); - /* Make sure the terminal will act fairly normal for us */ set_term(0); /* Setup stdout, stderr for the new process so @@ -527,11 +522,6 @@ static pid_t run(struct init_action *a) dup(0); dup(0); - /* For interactive jobs, create a new session - * and become the process group leader */ - if ((a->action & (RESPAWN))) - setsid(); - /* If the init Action requires us to wait, then force the * supplied terminal to be the controlling tty. */ if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) { |