shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-24 14:50:17 +03:00
Code

Revert "Add check to switch VTs only between K_XLATE or K_UNICODE"

Browse Source 
This reverts commit 13a43c73d8cbac4b65472de04bb88ea1bacdeb89.
This commit is contained in:
Lennart Poettering 2019-07-18 16:01:05 +02:00
parent 4f0acdb366
commit 15bba61325
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/basic/terminal-util.c
View File

@ -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;

7
src/vconsole/vconsole-setup.c
View File

@ -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);