summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-19 14:15:42 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-19 14:15:42 +0000
commit00aab70637bed20c37dc95ddab4b2e5e85135d2d (patch)
treeccbf195396c565ac07d6f8326ea4092a83d1e2ca /perl-install
parentc1630ef3344150d5070aa9421544080be98cf10d (diff)
downloaddrakx-backup-do-not-use-00aab70637bed20c37dc95ddab4b2e5e85135d2d.tar
drakx-backup-do-not-use-00aab70637bed20c37dc95ddab4b2e5e85135d2d.tar.gz
drakx-backup-do-not-use-00aab70637bed20c37dc95ddab4b2e5e85135d2d.tar.bz2
drakx-backup-do-not-use-00aab70637bed20c37dc95ddab4b2e5e85135d2d.tar.xz
drakx-backup-do-not-use-00aab70637bed20c37dc95ddab4b2e5e85135d2d.zip
make only bad card Riva128 for testing XF4.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Xconfigurator.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index c110c2922..fe8906648 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -575,10 +575,9 @@ sub testFinalConfig {
$skiptest || $o->{card}{server} =~ 'FBDev|Sun' and return 1; #- avoid testing with these.
#- needed for bad cards not restoring cleanly framebuffer, according to which version of XFree are used.
- my $bad_card = $o->{card}{identifier} =~ /Riva.*128/ ||
- ($o->{card}{use_xf4} ?
- $o->{card}{identifier} =~ /Matrox|SiS.*SG86C2.5|SiS.*559[78]|SiS.*300|SiS.*540|SiS.*6C?326|SiS.*6C?236|Tseng.*ET6\d00/ :
- $o->{card}{identifier} =~ /i740|Rage Mobility [PL]|3D Rage LT/);
+ my $bad_card = ($o->{card}{use_xf4} ?
+ $o->{card}{identifier} =~ /Matrox|SiS.*SG86C2.5|SiS.*559[78]|SiS.*300|SiS.*540|SiS.*6C?326|SiS.*6C?236|Tseng.*ET6\d00|Riva.*128/ :
+ $o->{card}{identifier} =~ /i740|Rage Mobility [PL]|3D Rage LT/);
log::l("the graphic card does not like X in framebuffer") if $bad_card;
my $verybad_card = $o->{card}{driver} eq 'i810';