diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-09-05 12:59:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-09-05 12:59:00 +0000 |
| commit | b9ae9c6f6459bc5906954e1b983a6002f0b68f8d (patch) | |
| tree | df142e613d877ba089680a3c861ef5f7928636ba | |
| parent | d2428470c34f096821615c7f119775b03aa86253 (diff) | |
| download | drakx-b9ae9c6f6459bc5906954e1b983a6002f0b68f8d.tar drakx-b9ae9c6f6459bc5906954e1b983a6002f0b68f8d.tar.gz drakx-b9ae9c6f6459bc5906954e1b983a6002f0b68f8d.tar.bz2 drakx-b9ae9c6f6459bc5906954e1b983a6002f0b68f8d.tar.xz drakx-b9ae9c6f6459bc5906954e1b983a6002f0b68f8d.zip | |
use EISA_ID in more cases to have the name
| -rw-r--r-- | perl-install/Xconfigurator.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 8daf6a726..653885b54 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -485,19 +485,19 @@ sub monitorConfiguration(;$$) { my $monitor = shift || {}; my $useFB = shift || 0; - if ($monitor->{hsyncrange} && $monitor->{vsyncrange}) { - add2hash($monitor, { type => "monitor1", vendor => "Unknown", model => "Unknown" }); - return $monitor; - } - readMonitorsDB("$ENV{SHARE_PATH}/ldetect-lst/MonitorsDB"); if ($monitor->{EISA_ID}) { + log::l("EISA_ID: $monitor->{EISA_ID}"); if (my ($mon) = grep { lc($_->{eisa}) eq $monitor->{EISA_ID} } values %monitors) { add2hash($monitor, $mon); - return $monitor; + log::l("EISA_ID corresponds to: $monitor->{type}"); } } + if ($monitor->{hsyncrange} && $monitor->{vsyncrange}) { + add2hash($monitor, { type => "monitor1", vendor => "Unknown", model => "Unknown" }); + return $monitor; + } my $good_default = (arch() =~ /ppc/ ? 'Apple|' : 'Generic|') . translate($good_default_monitor); $monitor->{type} ||= |