diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-09-12 18:13:14 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-09-12 18:13:14 +0000 |
| commit | 19b7a8154a673db23160944ab3bfc29f75802a76 (patch) | |
| tree | c87aec672db66a30fc82d82354072b34252b6f20 /perl-install | |
| parent | 1ae8a03ee70f271ead5a7ac90f1fadd369d3c1bd (diff) | |
| download | drakx-backup-do-not-use-19b7a8154a673db23160944ab3bfc29f75802a76.tar drakx-backup-do-not-use-19b7a8154a673db23160944ab3bfc29f75802a76.tar.gz drakx-backup-do-not-use-19b7a8154a673db23160944ab3bfc29f75802a76.tar.bz2 drakx-backup-do-not-use-19b7a8154a673db23160944ab3bfc29f75802a76.tar.xz drakx-backup-do-not-use-19b7a8154a673db23160944ab3bfc29f75802a76.zip | |
fix garbled font when asking UTF8 in text install
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/lang.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm index c0c291e66..bc878efa8 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -615,10 +615,10 @@ sub list { } sub l2console_font { - my ($locale) = @_; + my ($locale, $during_install) = @_; my $c = $charsets{l2charset($locale->{lang}) || return} or return; my ($name, $sfm, $acm) = @$c; - undef $acm if $locale->{utf8}; + undef $acm if $locale->{utf8} && !$during_install; ($name, $sfm, $acm); } @@ -895,7 +895,7 @@ sub write { }; log::l("lang::write: lang:$locale->{lang} country:$locale->{country} locale|lang:$locale_lang locale|country:$locale_country language:$h->{LANGUAGE}"); - my ($name, $sfm, $acm) = l2console_font($locale); + my ($name, $sfm, $acm) = l2console_font($locale, 0); if ($name && !$b_user_only) { my $p = "$prefix/usr/lib/kbd"; if ($name) { @@ -1032,7 +1032,7 @@ sub console_font_files() { sub load_console_font { my ($locale) = @_; - my ($name, $sfm, $acm) = l2console_font($locale); + my ($name, $sfm, $acm) = l2console_font($locale, 1); require run_program; run_program::run(if_($ENV{LD_LOADER}, $ENV{LD_LOADER}), |