openmamba/makedist-openmamba-milestone3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makedist.inc.sh: don't set a default locale in multilanguage mode

Browse Source
This commit is contained in:
root 2014-04-12 22:27:51 +02:00
parent 69bf3cc142
commit 407165fffb
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
makedist.inc.sh
View File

@ -22,6 +22,7 @@ install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses
[ "$LANGUAGE" = "en" ] && KEYMAP=us || KEYMAP="$LANGUAGE" [ "$LANGUAGE" = "en" ] && KEYMAP=us || KEYMAP="$LANGUAGE"
# configure localization # configure localization
if [ ! "$MULTILANGUAGE" ]; then
cat > $MOUNTDIR/etc/vconsole.conf << _EOF cat > $MOUNTDIR/etc/vconsole.conf << _EOF
KEYMAP=$KEYMAP KEYMAP=$KEYMAP
FONT=lat9w-16 FONT=lat9w-16
@ -29,24 +30,26 @@ FONT_MAP=8859-1_to_uni
FONT_UNIMAP= FONT_UNIMAP=
UNICODE=1 UNICODE=1
_EOF _EOF
else
# legacy cat > $MOUNTDIR/etc/vconsole.conf << _EOF
cat > $MOUNTDIR/etc/sysconfig/keyboard << _EOF FONT=lat9w-16
KEYMAP=$KEYMAP.map FONT_MAP=8859-1_to_uni
XKB_LAYOUT=$KEYMAP FONT_UNIMAP=
XKB_MODEL=pc105 UNICODE=1
XKB_OPTIONS=
_EOF _EOF
fi
[ "$COUNTRY" ] && { [ "$COUNTRY" ] && {
if [ ! "$MULTILANGUAGE" ]; then
cat > $MOUNTDIR/etc/locale.conf << _EOF cat > $MOUNTDIR/etc/locale.conf << _EOF
LANG=${LANGUAGE}_${COUNTRY}.UTF-8 LANG=${LANGUAGE}_${COUNTRY}.UTF-8
LC_COLLATE=C LC_COLLATE=C
_EOF _EOF
# legacy else
cat > $MOUNTDIR/etc/sysconfig/i18n << _EOF cat > $MOUNTDIR/etc/locale.conf << _EOF
LANG=${LANGUAGE}_${COUNTRY}.UTF-8 LC_COLLATE=C
_EOF _EOF
fi
} }
} }