Skip to content

Commit 1cd4211

Browse files
committed
vconsole-setup: don't fail with an empty keymap
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
1 parent 739bbc5 commit 1cd4211

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/vconsole/vconsole-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static int keyboard_load_and_wait(const char *vc, Context *c, bool utf8) {
280280
map_toggle = context_get_config(c, VC_KEYMAP_TOGGLE);
281281

282282
/* An empty map means kernel map */
283-
if (!map)
283+
if (isempty(map))
284284
return 0;
285285

286286
args[i++] = KBD_LOADKEYS;

0 commit comments

Comments
 (0)