]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
vconsole-setup: drop impossible condition 35181/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 13 Nov 2024 12:19:39 +0000 (13:19 +0100)
committerLuca Boccassi <bluca@debian.org>
Fri, 13 Dec 2024 16:23:05 +0000 (16:23 +0000)
src/vconsole/vconsole-setup.c

index a2d3938dc3db50fdfa7b77700f44823ba8dfc344..3fa0cbba614e1f20b26963f1fe450e466660d9c9 100644 (file)
@@ -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;