kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Unicode keytable. 

This patch was originally from Mandriva: dracut-013-fix_unicode_keytable.patch
master
Colin Guthrie 2011-11-30 22:21:24 +00:00 committed by Harald Hoyer
parent 39f87ab2ab
commit 95023eb325
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules.d/10i18n/README
View File

@ -47,6 +47,8 @@ The following variables are used by i18n install script and at initramfs
runtime: runtime:


KEYMAP - keyboard translation table loaded by loadkeys KEYMAP - keyboard translation table loaded by loadkeys
KEYTABLE - base name for keyboard translation table; if UNICODE is
true, Unicode version will be loaded. Overrides KEYMAP.
EXT_KEYMAPS - list of extra keymaps to bo loaded (sep. by space) EXT_KEYMAPS - list of extra keymaps to bo loaded (sep. by space)
UNICODE - boolean, indicating UTF-8 mode UNICODE - boolean, indicating UTF-8 mode
FONT - console font FONT - console font

49
modules.d/10i18n/module-setup.sh
View File

@ -110,8 +110,38 @@ install() {
[ -f $I18N_CONF ] && . $I18N_CONF [ -f $I18N_CONF ] && . $I18N_CONF
[ -f $VCONFIG_CONF ] && . $VCONFIG_CONF [ -f $VCONFIG_CONF ] && . $VCONFIG_CONF


shopt -q -s nocasematch
if [[ ${UNICODE} ]]
then
if [[ ${UNICODE} = YES || ${UNICODE} = 1 ]]
then
UNICODE=1
elif [[ ${UNICODE} = NO || ${UNICODE} = 0 ]]
then
UNICODE=0
else
UNICODE=''
fi
fi
if [[ ! ${UNICODE} && ${LANG} =~ .*\.UTF-?8 ]]
then
UNICODE=1
fi
shopt -q -u nocasematch

# Gentoo user may have KEYMAP set to something like "-u pl2", # Gentoo user may have KEYMAP set to something like "-u pl2",
KEYMAP=${KEYMAP#-* } KEYMAP=${KEYMAP#-* }

# KEYTABLE is a bit special - it defines base keymap name and UNICODE
# determines whether non-UNICODE or UNICODE version is used

if [[ ${KEYTABLE} ]]; then
if [[ ${UNICODE} == 1 ]]; then
[[ ${KEYTABLE} =~ .*\.uni.* ]] || KEYTABLE=${KEYTABLE%.map*}.uni
fi
KEYMAP=${KEYTABLE}
fi

# I'm not sure of the purpose of UNIKEYMAP and GRP_TOGGLE. They were in # I'm not sure of the purpose of UNIKEYMAP and GRP_TOGGLE. They were in
# original redhat-i18n module. Anyway it won't hurt. # original redhat-i18n module. Anyway it won't hurt.
EXT_KEYMAPS+=\ ${UNIKEYMAP}\ ${GRP_TOGGLE} EXT_KEYMAPS+=\ ${UNIKEYMAP}\ ${GRP_TOGGLE}
@ -150,25 +180,6 @@ install() {
inst_simple ${kbddir}/unimaps/${FONT_UNIMAP}.uni inst_simple ${kbddir}/unimaps/${FONT_UNIMAP}.uni
fi fi


shopt -q -s nocasematch
if [[ ${UNICODE} ]]
then
if [[ ${UNICODE} = YES || ${UNICODE} = 1 ]]
then
UNICODE=1
elif [[ ${UNICODE} = NO || ${UNICODE} = 0 ]]
then
UNICODE=0
else
UNICODE=''
fi
fi
if [[ ! ${UNICODE} && ${LANG} =~ .*\.UTF-?8 ]]
then
UNICODE=1
fi
shopt -q -u nocasematch

mksubdirs ${initdir}${I18N_CONF} mksubdirs ${initdir}${I18N_CONF}
mksubdirs ${initdir}${VCONFIG_CONF} mksubdirs ${initdir}${VCONFIG_CONF}
print_vars LC_ALL LANG >> ${initdir}${I18N_CONF} print_vars LC_ALL LANG >> ${initdir}${I18N_CONF}