From febbc24ee049f06997bbf3283b1488129909a02b Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 24 Jul 2023 15:35:47 +0100 Subject: [PATCH] mkosi: set default-keymap='' on Debian/Ubuntu --- mkosi.presets/00-base/mkosi.build | 8 ++++++++ 1 file changed, 8 insertions(+) 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//. -- 2.47.3