Skip to content

Commit

Permalink
Revert "Add check to switch VTs only between K_XLATE or K_UNICODE"
Browse files Browse the repository at this point in the history
This reverts commit 13a43c7.

Fixes: #12616
  • Loading branch information
mbiebl committed Jun 4, 2019
1 parent a54650e commit 5b14d01
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
9 changes: 1 addition & 8 deletions src/basic/terminal-util.c
Expand Up @@ -1250,18 +1250,11 @@ int vt_default_utf8(void) {
}

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;

Expand Down
7 changes: 0 additions & 7 deletions src/vconsole/vconsole-setup.c
Expand Up @@ -93,13 +93,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);
Expand Down

0 comments on commit 5b14d01

Please sign in to comment.