]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: set default-keymap='' on Debian/Ubuntu 28505/head
authorLuca Boccassi <bluca@debian.org>
Mon, 24 Jul 2023 14:35:47 +0000 (15:35 +0100)
committerLuca Boccassi <bluca@debian.org>
Mon, 24 Jul 2023 14:43:16 +0000 (15:43 +0100)
mkosi.presets/00-base/mkosi.build

index eb95d1520111fb6f8437caec5cb160e8af25bd81..b1b8281d800565c4ceb74c8d31e1d65fdcc9bcbb 100755 (executable)
@@ -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>/.