From 1cd421106893c5126e33e211cf6634e9167d1762 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 24 Jul 2023 15:31:02 +0100 Subject: [PATCH 1/2] 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 --- src/vconsole/vconsole-setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 1d5ee9ad44..d54764207e 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; From febbc24ee049f06997bbf3283b1488129909a02b Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 24 Jul 2023 15:35:47 +0100 Subject: [PATCH 2/2] 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 eb95d15201..b1b8281d80 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//.