From 15bba61325df06bc3d56c770c5afebd64168df11 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 18 Jul 2019 16:01:05 +0200 Subject: [PATCH 1/3] Revert "Add check to switch VTs only between K_XLATE or K_UNICODE" This reverts commit 13a43c73d8cbac4b65472de04bb88ea1bacdeb89. --- src/basic/terminal-util.c | 9 +-------- src/vconsole/vconsole-setup.c | 7 ------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 5b6cd7e316..17cd64989e 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -1278,18 +1278,11 @@ int vt_verify_kbmode(int fd) { } int vt_reset_keyboard(int fd) { - int kb, r; + int kb; /* If we can't read the default, then default to unicode. It's 2017 after all. */ kb = vt_default_utf8() != 0 ? K_UNICODE : K_XLATE; - r = vt_verify_kbmode(fd); - if (r == -EBUSY) { - log_debug_errno(r, "Keyboard is not in XLATE or UNICODE mode, not resetting: %m"); - return 0; - } else if (r < 0) - return r; - if (ioctl(fd, KDSKBMODE, kb) < 0) return -errno; diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index d2bc3921d2..42150be8e9 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -76,13 +76,6 @@ static int toggle_utf8(const char *name, int fd, bool utf8) { assert(name); - r = vt_verify_kbmode(fd); - if (r == -EBUSY) { - log_warning_errno(r, "Virtual console %s is not in K_XLATE or K_UNICODE: %m", name); - return 0; - } else if (r < 0) - return log_warning_errno(r, "Failed to verify kbdmode on %s: %m", name); - r = ioctl(fd, KDSKBMODE, utf8 ? K_UNICODE : K_XLATE); if (r < 0) return log_warning_errno(errno, "Failed to %s UTF-8 kbdmode on %s: %m", enable_disable(utf8), name); From 26382cab1b1a030f68b987fdd6cd374490f2b484 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 18 Jul 2019 16:01:07 +0200 Subject: [PATCH 2/3] Revert "Move verify_vc_kbmode() to terminal-util.c as vt_verify_kbmode()" This reverts commit bb5ac84d79ac3aef606a4a9eeaafef94a1f199be. --- src/basic/terminal-util.c | 17 ----------------- src/basic/terminal-util.h | 1 - src/vconsole/vconsole-setup.c | 23 ++++++++++++++++++++--- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 17cd64989e..cf6af45fbb 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -1260,23 +1260,6 @@ int vt_default_utf8(void) { return parse_boolean(b); } -int vt_verify_kbmode(int fd) { - int curr_mode; - - /* - * Make sure we only adjust consoles in K_XLATE or K_UNICODE mode. - * Otherwise we would (likely) interfere with X11's processing of the - * key events. - * - * http://lists.freedesktop.org/archives/systemd-devel/2013-February/008573.html - */ - - if (ioctl(fd, KDGKBMODE, &curr_mode) < 0) - return -errno; - - return IN_SET(curr_mode, K_XLATE, K_UNICODE) ? 0 : -EBUSY; -} - int vt_reset_keyboard(int fd) { int kb; diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h index 3e39768ab1..efc22b1591 100644 --- a/src/basic/terminal-util.h +++ b/src/basic/terminal-util.h @@ -158,7 +158,6 @@ int openpt_allocate_in_namespace(pid_t pid, int flags, char **ret_slave); int open_terminal_in_namespace(pid_t pid, const char *name, int mode); int vt_default_utf8(void); -int vt_verify_kbmode(int fd); int vt_reset_keyboard(int fd); int vt_restore(int fd); int vt_release(int fd, bool restore_vt); diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 42150be8e9..976dd825bc 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -70,6 +70,23 @@ static int verify_vc_allocation_byfd(int fd) { return verify_vc_allocation(vcs.v_active); } +static int verify_vc_kbmode(int fd) { + int curr_mode; + + /* + * Make sure we only adjust consoles in K_XLATE or K_UNICODE mode. + * Otherwise we would (likely) interfere with X11's processing of the + * key events. + * + * http://lists.freedesktop.org/archives/systemd-devel/2013-February/008573.html + */ + + if (ioctl(fd, KDGKBMODE, &curr_mode) < 0) + return -errno; + + return IN_SET(curr_mode, K_XLATE, K_UNICODE) ? 0 : -EBUSY; +} + static int toggle_utf8(const char *name, int fd, bool utf8) { int r; struct termios tc = {}; @@ -273,7 +290,7 @@ static void setup_remaining_vcs(int src_fd, unsigned src_idx, bool utf8) { continue; } - if (vt_verify_kbmode(fd_d) < 0) + if (verify_vc_kbmode(fd_d) < 0) continue; toggle_utf8(ttyname, fd_d, utf8); @@ -348,7 +365,7 @@ static int find_source_vc(char **ret_path, unsigned *ret_idx) { err = -fd; continue; } - r = vt_verify_kbmode(fd); + r = verify_vc_kbmode(fd); if (r < 0) { if (!err) err = -r; @@ -381,7 +398,7 @@ static int verify_source_vc(char **ret_path, const char *src_vc) { if (r < 0) return log_error_errno(r, "Virtual console %s is not allocated: %m", src_vc); - r = vt_verify_kbmode(fd); + r = verify_vc_kbmode(fd); if (r < 0) return log_error_errno(r, "Virtual console %s is not in K_XLATE or K_UNICODE: %m", src_vc); From e8d1d6e76b5716e49dcccc8d9496de95ce035571 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 18 Jul 2019 16:05:56 +0200 Subject: [PATCH 3/3] =?UTF-8?q?vconsole-setup:=20rename=20toggle=5Futf8()?= =?UTF-8?q?=20=E2=86=92=20toggle=5Futf8=5Fvc()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's make clearer that toggle_utf8_sysfs() is about sysfs, and toggle_utf8_vc() about VC access --- src/vconsole/vconsole-setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 976dd825bc..75d052ae70 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -87,11 +87,12 @@ static int verify_vc_kbmode(int fd) { return IN_SET(curr_mode, K_XLATE, K_UNICODE) ? 0 : -EBUSY; } -static int toggle_utf8(const char *name, int fd, bool utf8) { +static int toggle_utf8_vc(const char *name, int fd, bool utf8) { int r; struct termios tc = {}; assert(name); + assert(fd >= 0); r = ioctl(fd, KDSKBMODE, utf8 ? K_UNICODE : K_XLATE); if (r < 0) @@ -293,7 +294,7 @@ static void setup_remaining_vcs(int src_fd, unsigned src_idx, bool utf8) { if (verify_vc_kbmode(fd_d) < 0) continue; - toggle_utf8(ttyname, fd_d, utf8); + (void) toggle_utf8_vc(ttyname, fd_d, utf8); if (cfo.op != KD_FONT_OP_SET) continue; @@ -458,7 +459,7 @@ int main(int argc, char **argv) { log_warning_errno(r, "Failed to read /proc/cmdline: %m"); (void) toggle_utf8_sysfs(utf8); - (void) toggle_utf8(vc, fd, utf8); + (void) toggle_utf8_vc(vc, fd, utf8); r = font_load_and_wait(vc, vc_font, vc_font_map, vc_font_unimap); keyboard_ok = keyboard_load_and_wait(vc, vc_keymap, vc_keymap_toggle, utf8) == 0;