From: Luca Boccassi <bluca@debian.org>
Date: Mon, 24 Jul 2023 14:31:02 +0000 (+0100)
Subject: vconsole-setup: don't fail with an empty keymap
X-Git-Tag: v254~23^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cd421106893c5126e33e211cf6634e9167d1762;p=thirdparty%2Fsystemd.git

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 f129d0e77c4c9a0e12ae38cd241cd49846844a80
---

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 1d5ee9ad442..d54764207e1 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -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;