fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 03:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ply-device-manager: fix default XKB keymap fallback overriding KEYMAP

Browse source 
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.
This commit is contained in:
Clayton Craft 2026-04-17 09:56:27 -07:00
parent e72b0fa557
commit 3e6f30d93a
No known key found for this signature in database
GPG key ID: B14FABC9971C467A
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libply-splash-core/ply-device-manager.c
View file

@ -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,