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

This reverts commit 13a43c73d8cbac4b65472de04bb88ea1bacdeb89.

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 5b6cd7e316fb020455999d42ef7800db521bd039..17cd64989e9455c41961679d1ffe3adf6e63891a 100644 (file)
--- 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 d2bc3921d281deeb1ce262298355af74325c84f4..42150be8e962356e9483ad0998d3eb82b1287ec5 100644 (file)
--- 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);