summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-02 14:52:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-02 14:52:41 +0000
commitc367a7b536cbc28a666370a8935718980bdc5ee3 (patch)
tree367cf2853e3fa81eee160437c102ca8c6b3b39dc /perl-install/Xconfigurator.pm
parentb6b6e19519b647762f5b1497387893bc8094f879 (diff)
downloaddrakx-backup-do-not-use-c367a7b536cbc28a666370a8935718980bdc5ee3.tar
drakx-backup-do-not-use-c367a7b536cbc28a666370a8935718980bdc5ee3.tar.gz
drakx-backup-do-not-use-c367a7b536cbc28a666370a8935718980bdc5ee3.tar.bz2
drakx-backup-do-not-use-c367a7b536cbc28a666370a8935718980bdc5ee3.tar.xz
drakx-backup-do-not-use-c367a7b536cbc28a666370a8935718980bdc5ee3.zip
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 016344aef..ce37bdacf 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -101,7 +101,7 @@ sub readMonitorsDB {
/^#/ and next;
/^$/ and next;
- my @fields = qw(type bandwidth hsyncrange vsyncrange);
+ my @fields = qw(vendor type eisa hsyncrange vsyncrange);
my @l = split /\s*;\s*/;
@l == @fields or log::l("bad line $lineno ($_)"), next;
@@ -110,7 +110,7 @@ sub readMonitorsDB {
my $i; for ($i = 0; $monitors{"$l{type} ($i)"}; $i++) {}
$l{type} = "$l{type} ($i)";
}
- $monitors{$l{type}} = \%l;
+ $monitors{"$l{vendor}|$l{type}"} = \%l;
}
while (my ($k, $v) = each %standard_monitors) {
$monitors{_("Generic") . "|" . translate($k)} =
@@ -298,6 +298,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";
log::l("the graphic card does not like X in framebuffer") if $bad_card;
my $mesg = _("Do you want to test the configuration?");