diff --git a/support-other-tty-lines-not-vconsole.patch b/support-other-tty-lines-not-vconsole.patch index f50ef54..1021cfd 100644 --- a/support-other-tty-lines-not-vconsole.patch +++ b/support-other-tty-lines-not-vconsole.patch @@ -1,8 +1,3 @@ ---- - login-utils/sulogin.c | 11 ++++++----- - term-utils/agetty.c | 17 +++++++++-------- - 2 files changed, 15 insertions(+), 13 deletions(-) - --- login-utils/sulogin.c +++ login-utils/sulogin.c 2014-05-07 14:06:56.198236254 +0000 @@ -142,8 +142,11 @@ static void tcinit(struct console *con) @@ -31,7 +26,7 @@ case K_UNICODE: setlocale(LC_CTYPE, "C.UTF-8"); --- term-utils/agetty.c -+++ term-utils/agetty.c 2014-05-07 14:02:49.798735674 +0000 ++++ term-utils/agetty.c 2014-05-07 14:14:16.647523097 +0000 @@ -139,6 +139,7 @@ struct options { int nice; /* Run login with this priority */ int numspeed; /* number of baud rates to try */ @@ -64,13 +59,17 @@ setenv("TERM", op->term, 1); } -@@ -1124,9 +1128,6 @@ static void termio_init(struct options * - #if defined(IUTF8) && defined(KDGKBMODE) - int mode; +@@ -1122,12 +1126,7 @@ static void termio_init(struct options * + if (op->flags & F_VCONSOLE) { + #if defined(IUTF8) && defined(KDGKBMODE) +- int mode; +- - /* Detect mode of current keyboard setup, e.g. for UTF-8 */ - if (ioctl(STDIN_FILENO, KDGKBMODE, &mode) < 0) - mode = K_RAW; - switch(mode) { +- switch(mode) { ++ switch(op->kbmode) { case K_UNICODE: setlocale(LC_CTYPE, "C.UTF-8"); + op->flags |= F_UTF8;