From ef016519fadd0d52908858470a704cce6a8ceeff Mon Sep 17 00:00:00 2001
From: Mystery Man <unknown@mandriva.org>
Date: Thu, 17 Apr 2003 14:51:14 +0000
Subject: This commit was manufactured by cvs2svn to create tag 'V1_1_9_55mdk'.

---
 perl-install/install_gtk.pm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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

diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 89517dffb..fe8ae2fe9 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -7,6 +7,7 @@ use my_gtk qw(:helpers :wrappers);
 use common;
 use lang;
 use devices;
+use log;
 
 #-#####################################################################################
 #-INTERN CONSTANT
@@ -188,21 +189,18 @@ sub init_sizes() {
 
 #------------------------------------------------------------------------------
 sub createXconf {
-    my ($file, $mouse_type, $mouse_dev, $wacom_dev) = @_;
+    my ($file, $mouse_type, $mouse_dev, $wacom_dev, $Driver) = @_;
 
     $mouse_type = 'IMPS/2' if $mouse_type eq 'ExplorerPS/2';
-    devices::make("/dev/kbd") if arch() =~ /^sparc/; #- used by Xsun style server.
     symlinkf(devices::make($mouse_dev), "/dev/mouse");
 
     #- needed for imlib to start on 8-bit depth visual.
     symlink("/tmp/stage2/etc/imrc", "/etc/imrc");
     symlink("/tmp/stage2/etc/im_palette.pal", "etc/im_palette.pal");
 
-if (arch() =~ /^ia64/) {
-     require Xconfig::card;
-     my ($card) = Xconfig::card::probe();
-     Xconfig::card::add_to_card__using_Cards($card, $card->{type}) if $card && $card->{type};
-     output($file, sprintf(<<'END', $mouse_type, $card->{driver}));
+if ($Driver) {
+	log::l("Mouse type is $mouse_type and Card driver is " . $card->{Driver});
+    output($file, sprintf(<<'END', $mouse_type, $Driver));
 
 Section "Files"
    FontPath   "/usr/X11R6/lib/X11/fonts:unscaled"
-- 
cgit v1.2.1