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

Merge branch 'xkb-layout-fallback-fix' into 'main'

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

See merge request plymouth/plymouth!388
This commit is contained in:
clayton craft 2026-04-30 20:25:31 -07:00
commit cbdc76a2ea
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

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