summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-10-09 13:54:53 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-10-09 13:54:53 +0000
commit87600c03a38ec57e136b27903c14f1f0a80f9b88 (patch)
tree27e4fe837681878e9ccba865ac7fbafc80e9783c
parentb5b4f2b4a5c4758ca8d2c7ca973cd79f21739de5 (diff)
downloaddrakx-87600c03a38ec57e136b27903c14f1f0a80f9b88.tar
drakx-87600c03a38ec57e136b27903c14f1f0a80f9b88.tar.gz
drakx-87600c03a38ec57e136b27903c14f1f0a80f9b88.tar.bz2
drakx-87600c03a38ec57e136b27903c14f1f0a80f9b88.tar.xz
drakx-87600c03a38ec57e136b27903c14f1f0a80f9b88.zip
Somehow, "recent" DrakX changes mutated driver into Driver and card->type
into card->BoardName
-rw-r--r--perl-install/install_gtk.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 89517dffb..0bd4afcba 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
@@ -198,11 +199,12 @@ sub createXconf {
symlink("/tmp/stage2/etc/imrc", "/etc/imrc");
symlink("/tmp/stage2/etc/im_palette.pal", "etc/im_palette.pal");
-if (arch() =~ /^ia64/) {
+if (arch() =~ /^ia64|x86_64/) {
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}));
+ Xconfig::card::add_to_card__using_Cards($card, $card->{BoardName}) if $card && $card->{BoardName};
+ log::l("Mouse type is $mouse_type and Card driver is " . $card->{Driver});
+ output($file, sprintf(<<'END', $mouse_type, $card->{Driver}));
Section "Files"
FontPath "/usr/X11R6/lib/X11/fonts:unscaled"