Commit 407165fffbc5cf701de391b79567d4cee6edd6fd

Authored by root
1 parent 69bf3cc142
Exists in master

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

Showing 1 changed file with 15 additions and 12 deletions Side-by-side Diff

... ... @@ -22,31 +22,34 @@
22 22 [ "$LANGUAGE" = "en" ] && KEYMAP=us || KEYMAP="$LANGUAGE"
23 23  
24 24 # configure localization
25   - cat > $MOUNTDIR/etc/vconsole.conf << _EOF
  25 + if [ ! "$MULTILANGUAGE" ]; then
  26 + cat > $MOUNTDIR/etc/vconsole.conf << _EOF
26 27 KEYMAP=$KEYMAP
27 28 FONT=lat9w-16
28 29 FONT_MAP=8859-1_to_uni
29 30 FONT_UNIMAP=
30 31 UNICODE=1
31 32 _EOF
32   -
33   - # legacy
34   - cat > $MOUNTDIR/etc/sysconfig/keyboard << _EOF
35   -KEYMAP=$KEYMAP.map
36   -XKB_LAYOUT=$KEYMAP
37   -XKB_MODEL=pc105
38   -XKB_OPTIONS=
  33 + else
  34 + cat > $MOUNTDIR/etc/vconsole.conf << _EOF
  35 +FONT=lat9w-16
  36 +FONT_MAP=8859-1_to_uni
  37 +FONT_UNIMAP=
  38 +UNICODE=1
39 39 _EOF
  40 + fi
40 41  
41 42 [ "$COUNTRY" ] && {
42   - cat > $MOUNTDIR/etc/locale.conf << _EOF
  43 + if [ ! "$MULTILANGUAGE" ]; then
  44 + cat > $MOUNTDIR/etc/locale.conf << _EOF
43 45 LANG=${LANGUAGE}_${COUNTRY}.UTF-8
44 46 LC_COLLATE=C
45 47 _EOF
46   - # legacy
47   - cat > $MOUNTDIR/etc/sysconfig/i18n << _EOF
48   -LANG=${LANGUAGE}_${COUNTRY}.UTF-8
  48 + else
  49 + cat > $MOUNTDIR/etc/locale.conf << _EOF
  50 +LC_COLLATE=C
49 51 _EOF
  52 + fi
50 53 }
51 54  
52 55 }