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

Brian C. Lane bcl at redhat.com
Thu Jan 9 01:49:07 UTC 2014


On Tue, Jan 07, 2014 at 01:31:41PM +0100, Vratislav Podzimek wrote:
> 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

Ack

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)


More information about the anaconda-patches mailing list