From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 13 Nov 2024 12:19:39 +0000 (+0100)
Subject: vconsole-setup: drop impossible condition
X-Git-Tag: v258-rc1~1863^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F35181%2Fhead;p=thirdparty%2Fsystemd.git

vconsole-setup: drop impossible condition
---

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index a2d3938dc3d..3fa0cbba614 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -258,6 +258,9 @@ static int toggle_utf8_sysfs(bool utf8) {
         return 0;
 }
 
+/* SYSTEMD_DEFAULT_KEYMAP must not be empty */
+assert_cc(STRLEN(SYSTEMD_DEFAULT_KEYMAP) > 0);
+
 static int keyboard_load_and_wait(const char *vc, Context *c, bool utf8) {
         const char* args[8];
         unsigned i = 0;
@@ -271,8 +274,7 @@ static int keyboard_load_and_wait(const char *vc, Context *c, bool utf8) {
                 *keymap = empty_to_null(c->keymap) ?: SYSTEMD_DEFAULT_KEYMAP,
                 *keymap_toggle = empty_to_null(c->keymap_toggle);
 
-        /* An empty map means kernel map */
-        if (!keymap || streq(keymap, "@kernel"))
+        if (streq(keymap, "@kernel"))
                 return 0;
 
         args[i++] = KBD_LOADKEYS;