[master][PATCH] Use vc_keymap as X layout only if we get nothing from localed (#1048592)

Vratislav Podzimek vpodzime at redhat.com
Tue Jan 7 12:31:41 UTC 2014


systemd-localed's suggestion should be better than trying to use VConsole keymap
as X layout so we should use it if available and just fall back to VConsole
keymap if nothing is suggested.
---
 pyanaconda/keyboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index 21505a2..6a2035c 100644
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -327,7 +327,7 @@ def activate_keyboard(keyboard):
         if c_lay_var:
             # suggested by systemd-localed for a requested VConsole keymap
             keyboard.x_layouts.append(c_lay_var)
-        if keyboard.vc_keymap:
+        elif keyboard.vc_keymap:
             # nothing suggested by systemd-localed, but we may try to use the
             # same string for both VConsole keymap and X layout (will fail
             # safely if it doesn't work)
-- 
1.8.4.2



More information about the anaconda-patches mailing list