From 3e6f30d93ac1cde52c56a1309cd72ef4c2dd2f18 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 17 Apr 2026 09:56:27 -0700 Subject: [PATCH] ply-device-manager: fix default XKB keymap fallback overriding KEYMAP Only use XKB with libxkbcommon defaults when no layout is configured, but fall back to VT-based input when KEYMAP is set without XKBLAYOUT. This preserves any user console keymap configuration. --- src/libply-splash-core/ply-device-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c index 34b90ce3..ef9a63c9 100644 --- a/src/libply-splash-core/ply-device-manager.c +++ b/src/libply-splash-core/ply-device-manager.c @@ -832,7 +832,7 @@ parse_vconsole_conf (ply_device_manager_t *manager) ply_trace ("KEYMAP: %s, XKBLAYOUT: %s, XKBMODEL %s, XKBVARIANT: %s, XKBOPTIONS: %s\n", keymap, xkb_layout, xkb_model, xkb_variant, xkb_options); - if (manager->xkb_context != NULL) { + if (manager->xkb_context != NULL && (xkb_layout != NULL || keymap == NULL)) { struct xkb_rule_names xkb_keymap = { .layout = xkb_layout, .model = xkb_model,