summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 2b3567cd6..016d510fd 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -114,9 +114,8 @@ sub readMonitorsDB {
/^#/ and next;
/^$/ and next;
- my @fields = qw(vendor type eisa hsyncrange vsyncrange);
+ my @fields = qw(vendor type eisa hsyncrange vsyncrange dpms);
my @l = split /\s*;\s*/;
- @l == @fields or log::l("bad line $lineno ($_)"), next;
my %l; @l{@fields} = @l;
if ($monitors{$l{type}}) {
@@ -493,6 +492,13 @@ sub monitorConfiguration(;$$) {
readMonitorsDB("$ENV{SHARE_PATH}/ldetect-lst/MonitorsDB");
+ if ($monitor->{EISA_ID}) {
+ if (my ($mon) = grep { $_->{eisa} eq $monitor->{EISA_ID} } values %monitors) {
+ add2hash($monitor, $mon);
+ return $monitor;
+ }
+ }
+
my $good_default = (arch() =~ /ppc/ ? 'Apple|' : 'Generic|') . translate($good_default_monitor);
$monitor->{type} ||=
($::auto_install ? $low_default_monitor :