Merge branch 'f36-devel'

docs/release-notes/detach-keyboard-config-from-Live.rst

@@ -0,0 +1,22 @@
+:Type: GUI
+:Summary: Split keyboard configuration between Live media and system to be installed (#2016613)
+
+:Description:
+    The keyboard switching in the Anaconda installer on the Live media did not behave as expected
+    on Wayland based environments. When users changed the keyboard layout configuration that
+    configuration was reflected in the Live environment. However, if users pressed modifier keys
+    (CTRL or SHIFT) the keyboard specified by the Anaconda installer was changed back for the Live
+    environment. That is the result of how the Wayland protocol handles keyboard layout.
+
+    To avoid this unexpected behavior Anaconda will no longer control keyboard layout
+    configuration of the Live systems on Wayland Live environment. The keyboard configuration set
+    by Anaconda on the Live environment will be reflected only to the installed system.
+
+    BEWARE::
+
+      This means that users have to pay attention that their passwords are written by the correct
+      layout in the installer running inside the Live environment to be able to use the password in
+      the system after installation.
+:Links:
+    - https://bugzilla.redhat.com/show_bug.cgi?id=2016613
+    - https://github.com/rhinstaller/anaconda/pull/3912

pyanaconda/ui/gui/spokes/keyboard.py

@@ -344,12 +344,20 @@ def completed(self):
         if flags.flags.automatedInstall and not self._seen:
             return False
 
-        # The currently activated layout is a different from the
-        # selected ones. Ignore VNC, since VNC keymaps are weird
-        # and more on the client side.
-        if not self._confirmed and not flags.flags.usevnc \
-                and self._xkl_wrapper.get_current_layout() not in self._l12_module.XLayouts:
-            return False
+        # Not confirmed by a user should we request the check?
+        if not self._confirmed:
+            # Not an issue where system keyboard configuration is not allowed
+            # This have to be before the `_xkl_wrapper.get_current_layout()` because on Wayland
+            # that call can fail in case when system has multiple layouts set.
+            if not keyboard.can_configure_keyboard():
+                return True
+
+            # Current activated layout is a different from the selected ones
+            if self._xkl_wrapper.get_current_layout() not in self._l12_module.XLayouts:
+                # Not an issue for VNC, since VNC keymaps are weird and more on the client side.
+                if flags.flags.usevnc:
+                    return True
+                return False
 
         return True