summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-05 10:39:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-05 10:39:25 +0000
commit9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc (patch)
tree1bbdab435011d98f31d94c9382f8b13e4143ec7f /perl-install/Xconfigurator.pm
parentbbe401b766272753bd1d25942322fc3928132020 (diff)
downloaddrakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.tar
drakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.tar.gz
drakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.tar.bz2
drakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.tar.xz
drakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.zip
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 3f7d6e00b..22b5a5434 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -168,6 +168,7 @@ sub cardConfiguration(;$$$) {
add2hash($card, cardName2card($card->{type})) if $card->{type};
add2hash($card, { vendor => "Unknown", board => "Unknown" });
+ $::xf4 = $card->{identifier} =~ /Rage 128/ if !$::expert;
$card->{prog} = "/usr/X11R6/bin/" . ($::xf4 && $card->{driver} ? 'XFree86' : "XF86_$card->{server}");
-x "$prefix$card->{prog}" or $install && do {
@@ -299,6 +300,7 @@ sub testFinalConfig($;$$) {
#- needed for bad cards not restoring cleanly framebuffer
my $bad_card = $o->{card}{identifier} =~ /i740|ViRGE/;
$bad_card ||= $o->{card}{identifier} eq "ATI|3D Rage P/M Mobility AGP 2x";
+ $bad_card ||= $::xf4;
log::l("the graphic card does not like X in framebuffer") if $bad_card;
my $mesg = _("Do you want to test the configuration?");