Re: [PATCH 2/2] i18n: loading additional keymaps declared in EXT_KEYMAPS

[Harald Hoyer <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]

On 07/02/2010 10:37 AM, Amadeusz Żołnowski wrote:
>
> ---
>   modules.d/10i18n/console_init |    2 +-
>   modules.d/10i18n/install      |    1 -
>   2 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/modules.d/10i18n/console_init b/modules.d/10i18n/console_init
> index 146cd26..fa74595 100755
> --- a/modules.d/10i18n/console_init
> +++ b/modules.d/10i18n/console_init
> @@ -36,7 +36,7 @@ set_keymap() {
>
>       [ "${UNICODE}" = 1 ]&&  utf_switch=-u
>
> -    loadkeys ${utf_switch} ${KEYMAP}.map
> +    loadkeys ${utf_switch} ${KEYMAP} ${EXT_KEYMAPS}
>   }
>
>   set_font() {
> diff --git a/modules.d/10i18n/install b/modules.d/10i18n/install
> index 05de54a..caa3fac 100755
> --- a/modules.d/10i18n/install
> +++ b/modules.d/10i18n/install
> @@ -98,7 +98,6 @@ install_local_keyboard() {
>
>       # Gentoo user may have KEYMAP set to something like "-u pl2",
>       KEYMAP=${KEYMAP#-* }
> -    EXT_KEYMAPS=${EXT_KEYMAPS:-backspace}
>       # I'm not sure of the purpose of UNIKEYMAP and GRP_TOGGLE.  They were in
>       # original redhat-i18n module.  Anyway it won't hurt.
>       EXT_KEYMAPS+=\ ${UNIKEYMAP}\ ${GRP_TOGGLE}

pushed (merged)