diff --git a/makedist.inc.sh b/makedist.inc.sh index 52c517c..8ad5ec8 100644 --- a/makedist.inc.sh +++ b/makedist.inc.sh @@ -22,31 +22,34 @@ install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses [ "$LANGUAGE" = "en" ] && KEYMAP=us || KEYMAP="$LANGUAGE" # configure localization - cat > $MOUNTDIR/etc/vconsole.conf << _EOF + if [ ! "$MULTILANGUAGE" ]; then + cat > $MOUNTDIR/etc/vconsole.conf << _EOF KEYMAP=$KEYMAP FONT=lat9w-16 FONT_MAP=8859-1_to_uni FONT_UNIMAP= UNICODE=1 _EOF - - # legacy - cat > $MOUNTDIR/etc/sysconfig/keyboard << _EOF -KEYMAP=$KEYMAP.map -XKB_LAYOUT=$KEYMAP -XKB_MODEL=pc105 -XKB_OPTIONS= + else + cat > $MOUNTDIR/etc/vconsole.conf << _EOF +FONT=lat9w-16 +FONT_MAP=8859-1_to_uni +FONT_UNIMAP= +UNICODE=1 _EOF + fi [ "$COUNTRY" ] && { - cat > $MOUNTDIR/etc/locale.conf << _EOF + if [ ! "$MULTILANGUAGE" ]; then + cat > $MOUNTDIR/etc/locale.conf << _EOF LANG=${LANGUAGE}_${COUNTRY}.UTF-8 LC_COLLATE=C _EOF - # legacy - cat > $MOUNTDIR/etc/sysconfig/i18n << _EOF -LANG=${LANGUAGE}_${COUNTRY}.UTF-8 + else + cat > $MOUNTDIR/etc/locale.conf << _EOF +LC_COLLATE=C _EOF + fi } }