From f393b2f99f8405754d698359b0e511ed69022299 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 13 Nov 2024 13:19:39 +0100 Subject: [PATCH] vconsole-setup: drop impossible condition --- src/vconsole/vconsole-setup.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- 2.47.3