diff options
| -rw-r--r-- | src/basic/terminal-util.c | 9 | ||||
| -rw-r--r-- | src/vconsole/vconsole-setup.c | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 3a9c85e5a0..0b71220ec4 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -1267,11 +1267,18 @@ int vt_verify_kbmode(int fd) { } int vt_reset_keyboard(int fd) { - int kb; + int kb, r; /* 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 1feb8d9370..140e0badd2 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -76,6 +76,13 @@ 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); |