From 19b7a8154a673db23160944ab3bfc29f75802a76 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Fri, 12 Sep 2003 18:13:14 +0000
Subject: fix garbled font when asking UTF8 in text install

---
 perl-install/lang.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install/lang.pm')

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}), 
-- 
cgit v1.2.1