From 85be1cc2d05ba4d2c3483023426e4878abd52807 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 2 Aug 2007 16:38:07 +0000
Subject: use kbd (setfont) instead of console-tools (consolechars)

quickly adapting fonts to match existing kbd fonts,
so dropping some for which i can't find a working equivalent
---
 perl-install/install/NEWS                  | 2 ++
 perl-install/install/share/list.xml        | 2 +-
 perl-install/install/steps_auto_install.pm | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'perl-install/install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9ef4b9487..faec7efbb 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- use kbd (setfont) instead of console-tools (consolechars)
+
 Version 10.4.154 - 2 August 2007, by Pascal "Pixel" Rigaux
 
 - drop supermount support
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index e4b068cc4..42ff937b5 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -35,7 +35,7 @@
   </if>
   quotacheck
 
-  consolechars kbd_mode
+  setfont kbd_mode
   Xorg xmodmap xset
   fb2png
   perl
diff --git a/perl-install/install/steps_auto_install.pm b/perl-install/install/steps_auto_install.pm
index 3b5e24636..debff44e0 100644
--- a/perl-install/install/steps_auto_install.pm
+++ b/perl-install/install/steps_auto_install.pm
@@ -106,9 +106,9 @@ sub charsetChanged {
     my ($o) = @_;
     lang::load_console_font($o->{locale});
 
-    my ($name, $_sfm, $acm) = lang::l2console_font($o->{locale}, 1);
+    my ($name, $_sfm) = lang::l2console_font($o->{locale});
     my %fs_options = lang::fs_options($o->{locale});
-    $iocharset = $name && $acm && $fs_options{iocharset} ne 'utf8' ? $fs_options{iocharset} : '';
+    $iocharset = $name && $fs_options{iocharset} ne 'utf8' ? $fs_options{iocharset} : '';
 }
 
 sub errorInStep {
-- 
cgit v1.2.1