Merge pull request #28505 from bluca/vconsole_debian

vconsole-setup: don't fail with an empty keymap

Author: bluca

mkosi.presets/00-base/mkosi.build

@@ -55,6 +55,13 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         UKIFY=true
     fi
 
+    # On Debian 'loadkeys us' fails
+    if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then
+        DEFAULT_KEYMAP=""
+    else
+        DEFAULT_KEYMAP="us"
+    fi
+
     CONFIGURE_OPTS=(
         -D sysvinit-path="$sysvinit_path"
         -D rootprefix="$rootprefix"
@@ -149,6 +156,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         -D first-boot-full-preset=true
         -D initrd=true
         -D fexecve=true
+        -D default-keymap="$DEFAULT_KEYMAP"
     )
 
     # On debian-like systems the library directory is not /usr/lib64 but /usr/lib/<arch-triplet>/.

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;