shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

vconsole-setup: drop impossible condition

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-11-13 13:19:39 +01:00 committed by Luca Boccassi
parent a814fd7897
commit f393b2f99f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vconsole/vconsole-setup.c
View 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;