Add support for virtual console keymap from live

Look for currently used keyboard layout and set that as virtual console keymap after conversion. It's probably what user wants to use because it was used during the installation.
rhinstaller · jkonecny12 · Aug 15, 2023 · Jul 27, 2023 · Jul 27, 2023 · Jul 27, 2023
commit 696f1f5d7bb8a130ece845abdfb252daf8938460
diff --git a/pyanaconda/modules/localization/live_keyboard.py b/pyanaconda/modules/localization/live_keyboard.py
@@ -50,6 +50,17 @@ def read_keyboard_layouts(self):
         """
         pass
 
+    @abstractmethod
+    def read_current_keyboard_layout(self):
+        """Read keyboard layout currently used.
+
+        It is the best candidate for the virtual console keymap.
+
+        :return: keyboard layout used for virtual_console (e.g: LUKS during boot)
+        :rtype: str
+        """
+        pass
+
     @staticmethod
     def _run_as_liveuser(argv):
         """Run the command in a system as liveuser user.
@@ -74,15 +85,34 @@ def read_keyboard_layouts(self):
         """
         command_args = ["gsettings", "get", "org.gnome.desktop.input-sources", "sources"]
         sources = self._run_as_liveuser(command_args)
+        result = self._convert_to_xkb_format(sources)
+        return result
+
+    def read_current_keyboard_layout(self):
+        """Read keyboard layout currently used.
 
-        # convert output "[('xkb', 'us'), ('xkb', 'cz+qwerty')]\n"
+        It is the best candidate for the virtual console keymap.
+
+        :return: keyboard layout used for virtual_console (e.g: LUKS during boot)
+        :rtype: str
+        """
+        command_args = ["gsettings", "get", "org.gnome.desktop.input-sources", "mru-sources"]
+        sources = self._run_as_liveuser(command_args)
+        result = self._convert_to_xkb_format(sources)
+        # take first recently used which is the currently used
+        if result:
+            return result[0]
+        return ""
+
+    def _convert_to_xkb_format(self, sources):
+        # convert input "[('xkb', 'us'), ('xkb', 'cz+qwerty')]\n"
+        # to a python list of '["us", "cz (qwerty)"]'
         try:
             sources = eval(sources.rstrip())
         except SyntaxError:
             log.error("Gnome Shell keyboard configuration can't be obtained from source %s!",
                       sources)
             return []
-
         result = []
 
         for t in sources:

diff --git a/pyanaconda/modules/localization/utils.py b/pyanaconda/modules/localization/utils.py
@@ -50,10 +50,13 @@ def get_missing_keyboard_configuration(localed_wrapper, x_layouts, vc_keymap):
         return x_layouts, vc_keymap
 
     live_keyboard = get_live_keyboard_instance()
-
-    if live_keyboard:
+    # layouts are not set by user, we should take a look for live configuration if available
+    if not x_layouts and live_keyboard:
         log.debug("Keyboad configuration from Live system is available")
-        x_layouts = _resolve_missing_from_live(live_keyboard, x_layouts)
+        x_layouts, vc_keymap = _resolve_missing_from_live(localed_wrapper,
+                                                          live_keyboard,
+                                                          x_layouts,
+                                                          vc_keymap)
 
     if not vc_keymap and not x_layouts:
         log.debug("Using default value %s for missing virtual console keymap", DEFAULT_KEYBOARD)
@@ -65,12 +68,15 @@ def get_missing_keyboard_configuration(localed_wrapper, x_layouts, vc_keymap):
     return x_layouts, vc_keymap
 
 
-def _resolve_missing_from_live(live_keyboard, x_layouts):
+def _resolve_missing_from_live(localed_wrapper, live_keyboard, x_layouts, vc_keymap):
+    x_layouts = live_keyboard.read_keyboard_layouts()
 
-    if not x_layouts:
-        return live_keyboard.read_keyboard_layouts()
+    if not vc_keymap:
+        live_layout = live_keyboard.read_current_keyboard_layout()
+        if live_layout:
+            vc_keymap = localed_wrapper.convert_layouts([live_layout])
 
-    return x_layouts
+    return x_layouts, vc_keymap
 
 
 def _resolve_missing_by_conversion(localed_wrapper, x_layouts, vc_keymap):