diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/ChangeLog | 5 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/lang.pm | 16 | ||||
| -rw-r--r-- | perl-install/share/list | 1 |
4 files changed, 24 insertions, 0 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index ea0bb8ea1..4129032ab 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,8 @@ +2000-06-05 Pablo Saratxaga <pablo@mandrakesoft.com> + + * install_steps.pm,lang.pm: added load_console_font, to load the + proper console fonts (text mode install is not very useful otherwise) + 2000-06-01 Pablo Saratxaga <pablo@mandrakesoft.com> * share/fonts.tar.bz2: replaced the Korean 16pt fonts by a 12pt font; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 9e2486d70..21b8b6dd4 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -90,6 +90,8 @@ sub selectLanguage { lang::set($o->{lang}); $o->{langs} ||= [ $o->{lang} ]; + lang::load_console_font($o->{lang}); + if ($o->{keyboard_unsafe} || !$o->{keyboard}) { $o->{keyboard_unsafe} = 1; $o->{keyboard} = keyboard::lang2keyboard($o->{lang}); diff --git a/perl-install/lang.pm b/perl-install/lang.pm index b7bb11d4d..0638f2840 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -334,6 +334,22 @@ sub load_po($) { } +sub load_console_font { + my ($lang) = @_; + my ($charset) = $languages{$lang}[1] ; + my $f = "-f lat0-sun16"; + + if (my $c = $charsets{$charset}) { + if ($c->[0]) { $f = "-f " . $c->[0] ; } + if ($c->[1]) { $f = $f . " -u " . $c->[1] ; } + if ($c->[2]) { $f = $f . " -m " . $c->[2] ; } + } + + log::l("loading console font: consolechars $f"); + system("consolechars $f"); + +} + #-sub load_font { #- my ($charset) = @_; #- my $fontFile = "lat0-sun16"; diff --git a/perl-install/share/list b/perl-install/share/list index f99a16d82..4ae14a4a9 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -1,4 +1,5 @@ /bin/ash +/bin/consolechars /bin/cpio /bin/gzip /lib/libnss_nis.so.2 |