From 174777181850705df7c6dbe234bd7e93d352666a Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 1 Nov 2014 14:11:57 +0100 Subject: Revert "Honour tty field in /etc/inittab" This reverts commit e63051d9843ddbafb1fabfd97d60e853bdeac129. This unbreaks the initial console on UML and possibly other platforms. Signed-off-by: Steven Barth --- utils/askfirst.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'utils') diff --git a/utils/askfirst.c b/utils/askfirst.c index e1f757a..6ad77aa 100644 --- a/utils/askfirst.c +++ b/utils/askfirst.c @@ -19,10 +19,34 @@ #include #include +static int redirect_output(const char *dev) +{ + pid_t p = setsid(); + int fd; + + chdir("/dev"); + fd = open(dev, O_RDWR); + chdir("/"); + + if (fd < 0) + return -1; + + dup2(fd, STDIN_FILENO); + dup2(fd, STDOUT_FILENO); + dup2(fd, STDERR_FILENO); + tcsetpgrp(fd, p); + close(fd); + + return 0; +} + int main(int argc, char **argv) { int c; + if (redirect_output(argv[1])) + fprintf(stderr, "%s: Failed to open %s\n", argv[0], argv[1]); + printf("Please press Enter to activate this console.\n"); do { c = getchar(); @@ -31,8 +55,8 @@ int main(int argc, char **argv) } while (c != 0xA); - execvp(argv[1], &argv[1]); - printf("%s: Failed to execute %s\n", argv[0], argv[1]); + execvp(argv[2], &argv[2]); + printf("%s: Failed to execute %s\n", argv[0], argv[2]); return -1; } -- cgit v1.2.3