From: Luca Boccassi <bluca@debian.org>
Date: Mon, 24 Jul 2023 14:35:47 +0000 (+0100)
Subject: mkosi: set default-keymap='' on Debian/Ubuntu
X-Git-Tag: v254~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F28505%2Fhead;p=thirdparty%2Fsystemd.git

mkosi: set default-keymap='' on Debian/Ubuntu
---

diff --git a/mkosi.presets/00-base/mkosi.build b/mkosi.presets/00-base/mkosi.build
index eb95d152011..b1b8281d800 100755
--- a/mkosi.presets/00-base/mkosi.build
+++ b/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>/.