Skip to content

Commit

Permalink
vconsole-setup: don't fail with an empty keymap
Browse files Browse the repository at this point in the history
The new meson option 'default-keymap' means that by default there's always
a keymap to configure, so vconsole-setup fails. Allow to set
-Ddefault-keymap="" to disable it and skip gracefully again.

Follow-up for f129d0e
  • Loading branch information
bluca committed Jul 24, 2023
1 parent 739bbc5 commit 1cd4211
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/vconsole/vconsole-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ static int keyboard_load_and_wait(const char *vc, Context *c, bool utf8) {
map_toggle = context_get_config(c, VC_KEYMAP_TOGGLE);

/* An empty map means kernel map */
if (!map)
if (isempty(map))
return 0;

args[i++] = KBD_LOADKEYS;
Expand Down

0 comments on commit 1cd4211

Please sign in to comment.