So after loader picks which terminal it likes best, it opens it, uses
dup2() to replace its fd (0,1,2) with the new terminal, and then does:
setsid(); ioctl(0, TIOCSCTTY, NULL);
to switch its controlling terminal to the new terminal (on fd 0).
In commit b8886ea3, the code was refactored a bit and the ioctl() got
moved *above* the dup2(), which meant that fd 0 was still the *old*
terminal, so the ioctl() would have no useful effect.
This commit makes ioctl() operate on the correct fd, and changes NULL
to '0' (since ioctl takes an int arg, not a pointer).
---
loader/serial.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/loader/serial.c b/loader/serial.c
index 735ee9e..eeec12f 100644
--- a/loader/serial.c
+++ b/loader/serial.c
@@ -194,7 +194,7 @@ int init_serial(struct termios *orig_cmode, int *orig_flags, GHashTable *cmdline
}
setsid();
- if (ioctl(0, TIOCSCTTY, NULL))
+ if (ioctl(fd, TIOCSCTTY, 0))
fprintf(stderr, "could not set new controlling tty\n");
if (dup2(fd, 0) == -1)
--
1.7.7.4
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
