terminal-util: modernize vt_reset_keyboard() a bit

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 60dcdb971287e3afda3fbcfc92db0a3c5e361b83..c1f463a39b7bb8f517ecdea9ddbe9be9aecd1c18 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -512,11 +512,16 @@ static int vt_default_utf8(void) {
 }
 
 static int vt_reset_keyboard(int fd) {
-        int kb;
+        int r, 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;
+        assert(fd >= 0);
 
+        /* If we can't read the default, then default to Unicode. It's 2024 after all. */
+        r = vt_default_utf8();
+        if (r < 0)
+                log_debug_errno(r, "Failed to determine kernel VT UTF-8 mode, assuming enabled: %m");
+
+        kb = vt_default_utf8() != 0 ? K_UNICODE : K_XLATE;
         return RET_NERRNO(ioctl(fd, KDSKBMODE, kb));
 }