root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util-livecd] don't set ballback locale

Browse source
This commit is contained in:
udeved 2015-02-26 23:50:45 +01:00
parent 1e57dad53b
commit 6fff0f73cc
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/util-livecd.sh
View file

@ -108,11 +108,11 @@ configure_language(){
local LOCALE=$(get_country) local LOCALE=$(get_country)
local KEYMAP=$(get_keyboard) local KEYMAP=$(get_keyboard)
local KBLAYOUT=$(get_layout) local KBLAYOUT=$(get_layout)
local FALLBACK="en_US" # local FALLBACK="en_US"
local TLANG=${LOCALE%.*} local TLANG=${LOCALE%.*}
sed -i -r "s/#(${TLANG}.*UTF-8)/\1/g" $1/etc/locale.gen sed -i -r "s/#(${TLANG}.*UTF-8)/\1/g" $1/etc/locale.gen
sed -i -r "s/#(${FALLBACK}.*UTF-8)/\1/g" $1/etc/locale.gen # sed -i -r "s/#(${FALLBACK}.*UTF-8)/\1/g" $1/etc/locale.gen
echo "LANG=${LOCALE}.UTF-8" >> $1/etc/environment echo "LANG=${LOCALE}.UTF-8" >> $1/etc/environment
@ -124,14 +124,11 @@ configure_language(){
else else
echo "KEYMAP=${KEYMAP}" > $1/etc/vconsole.conf echo "KEYMAP=${KEYMAP}" > $1/etc/vconsole.conf
echo "LANG=${LOCALE}.UTF-8" > $1/etc/locale.conf echo "LANG=${LOCALE}.UTF-8" > $1/etc/locale.conf
# localectl set-keymap --no-convert ${KEYMAP}
# localectl set-locale LANG=${LOCALE}.UTF-8
fi fi
write_x11_config $1 write_x11_config $1
echo "LANGUAGE=${LOCALE}:${FALLBACK}" >> $1/etc/locale.conf # echo "LANGUAGE=${LOCALE}:${FALLBACK}" >> $1/etc/locale.conf
#echo "LC_MESSAGES=${LOCALE}.UTF-8" >> $1/etc/locale.conf
loadkeys "${KEYMAP}" loadkeys "${KEYMAP}"
} }