Skip to contentSkip to conversation

i18n: removed unused functions from console_init

PATCH In review Amadeusz Żołnowski 2 participants 3 messages Jul 2, 2010 – Jul 9, 2010

lore
Share & tools
lore

Amadeusz Żołnowski

author
#0 lore raw

PATCH 1/2 i18n: removed unused functions from console_init

---
 modules.d/10i18n/console_init |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)
modules.d/10i18n/console_init +0 -20
index 9a8d621..146cd26 100755
@@ -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
Signature · 1 line
1.7.1
author
#1 lore raw

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

---
 modules.d/10i18n/console_init |    2 +-
 modules.d/10i18n/install      |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)
modules.d/10i18n/console_init +1 -1
index 146cd26..fa74595 100755
@@ -36,7 +36,7 @@ set_keymap() {
 
     [ "${UNICODE}" = 1 ] && utf_switch=-u
 
-    loadkeys ${utf_switch} ${KEYMAP}.map
+    loadkeys ${utf_switch} ${KEYMAP} ${EXT_KEYMAPS}
 }
 
 set_font() {
modules.d/10i18n/install +0 -1
index 05de54a..caa3fac 100755
@@ -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}
Signature · 1 line
1.7.1
#2 lore raw

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

Quoted 24 lines · Amadeusz Żołnowski
---
  modules.d/10i18n/console_init |    2 +-
  modules.d/10i18n/install      |    1 -
  2 files changed, 1 insertions(+), 2 deletions(-)
modules.d/10i18n/console_init +1 -1
index 146cd26..fa74595 100755
@@ -36,7 +36,7 @@ set_keymap() {
 
      [ "${UNICODE}" = 1 ]&&  utf_switch=-u
 
-    loadkeys ${utf_switch} ${KEYMAP}.map
+    loadkeys ${utf_switch} ${KEYMAP} ${EXT_KEYMAPS}
  }
 
  set_font() {
modules.d/10i18n/install +0 -0
index 05de54a..caa3fac 100755

modules.d/10i18n/install install_local_keyboard() { · line 103

Quoted 7 lines
modules.d/10i18n/install +0 -1
@@ -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)