[PATCH 1/2] i18n: removed unused functions from console_init

[PATCH 1/2] i18n: removed unused functions from console_init

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

---
 modules.d/10i18n/console_init |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/modules.d/10i18n/console_init b/modules.d/10i18n/console_init
index 9a8d621..146cd26 100755
--- a/modules.d/10i18n/console_init
+++ b/modules.d/10i18n/console_init
@@ -7,26 +7,6 @@ DEFAULT_SYSFONT=LatArCyrHeb-16
 DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap
 
 
-print_vars() {
-    local var value
-
-    for var in $@
-    do
-        value=$(eval echo \$$var)
-        [ -n "${value}" ] && echo "${var}=\"${value}\""
-    done
-}
-
-run_debug() {
-    echo -n $@
-    echo -n '   '
-    if $@; then
-        echo 'OK'
-    else
-        echo 'Failed!'
-    fi
-}
-
 set_keyboard() {
     local param
 
-- 
1.7.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

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

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]


---
 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}
-- 
1.7.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

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

[Harald Hoyer]

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)