summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-21 16:50:42 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-21 16:50:42 +0000
commit51986d94a7f8e51912b4cc2c6e742ed489bceb7e (patch)
tree5373f39a851b1f08461ca34183153bed6d488575
parentc45c3b20958598177788331423320964e4149d85 (diff)
downloaddrakx-backup-do-not-use-51986d94a7f8e51912b4cc2c6e742ed489bceb7e.tar
drakx-backup-do-not-use-51986d94a7f8e51912b4cc2c6e742ed489bceb7e.tar.gz
drakx-backup-do-not-use-51986d94a7f8e51912b4cc2c6e742ed489bceb7e.tar.bz2
drakx-backup-do-not-use-51986d94a7f8e51912b4cc2c6e742ed489bceb7e.tar.xz
drakx-backup-do-not-use-51986d94a7f8e51912b4cc2c6e742ed489bceb7e.zip
S3 ViRGE is a bad card for testing on live upgrade.
-rw-r--r--perl-install/Xconfigurator.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 169b5d371..6a4d7db27 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -578,6 +578,7 @@ sub testFinalConfig {
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|Rage 128/);
+ $::live and $bad_card ||= $o->{card}{identifier} =~ /S3.*ViRGE/;
log::l("the graphic card does not like X in framebuffer") if $bad_card;
my $verybad_card = $o->{card}{driver} eq 'i810';