From: n3rdopolis <bluescreen_avenger@verizon.net>
Date: Tue, 24 Jan 2023 17:53:29 +0000 (-0500)
Subject: ply-device-manager: Change XKB_* variables from vconsole.conf to match systemd's
X-Git-Tag: 23.51.283~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ffd55e40bd692519d1bc9b8d33ca0790ead2cd5;p=thirdparty%2Fplymouth.git

ply-device-manager: Change XKB_* variables from vconsole.conf to match systemd's
---

diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index 15a14c65..b7f99dc0 100644
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -833,16 +833,16 @@ parse_vconsole_conf (ply_device_manager_t *manager)
                         keymap = ply_key_file_get_value (vconsole_conf, NULL, "KEYMAP");
                         keymap = strip_quotes (keymap);
                 }
-                xkb_layout = ply_key_file_get_value (vconsole_conf, NULL, "XKB_LAYOUT");
+                xkb_layout = ply_key_file_get_value (vconsole_conf, NULL, "XKBLAYOUT");
                 xkb_layout = strip_quotes (xkb_layout);
 
-                xkb_model = ply_key_file_get_value (vconsole_conf, NULL, "XKB_MODEL");
+                xkb_model = ply_key_file_get_value (vconsole_conf, NULL, "XKBMODEL");
                 xkb_model = strip_quotes (xkb_model);
 
-                xkb_variant = ply_key_file_get_value (vconsole_conf, NULL, "XKB_VARIANT");
+                xkb_variant = ply_key_file_get_value (vconsole_conf, NULL, "XKBVARIANT");
                 xkb_variant = strip_quotes (xkb_variant);
 
-                xkb_options = ply_key_file_get_value (vconsole_conf, NULL, "XKB_OPTIONS");
+                xkb_options = ply_key_file_get_value (vconsole_conf, NULL, "XKBOPTIONS");
                 xkb_options = strip_quotes (xkb_options);
         }
         ply_key_file_free (vconsole_conf);