summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-01-18 11:22:08 +0000
committerThierry Vignaud <tv@mandriva.org>2010-01-18 11:22:08 +0000
commita0015e6f4736e1cfd8e79a2329714a05b268d5eb (patch)
tree63ec26e5fdbe4c9f1e0a4e5c6856f385d03c457f
parenta4accce4f8d057a3f13a80b01c137ff550e5d67b (diff)
downloaddrakx-a0015e6f4736e1cfd8e79a2329714a05b268d5eb.tar
drakx-a0015e6f4736e1cfd8e79a2329714a05b268d5eb.tar.gz
drakx-a0015e6f4736e1cfd8e79a2329714a05b268d5eb.tar.bz2
drakx-a0015e6f4736e1cfd8e79a2329714a05b268d5eb.tar.xz
drakx-a0015e6f4736e1cfd8e79a2329714a05b268d5eb.zip
(getSCSI) guess real vendor names like we use to do for IDE devices for years
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/detect_devices.pm4
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 829eb6104..ad81bda23 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,7 @@
o enable to set bootloader password in high security level
- harddrake
o fix displaying empty info for USB discs
+ o guess real vendor names for SCSI discs like we do for IDE devices
Version 13.4 - 7 January 2009
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 5244a3445..5b09c494a 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -235,6 +235,10 @@ sub getSCSI() {
$raw_type =~ /Scanner|Processor/ && 'scanner';
my ($vendor, $model) = ($get->('vendor'), $get->('model'));
+ foreach my $name (keys %eide_hds) {
+ next if !$name;
+ ($vendor, $model) = ($eide_hds{$name}, $2) if $model =~ /^$name(-|\s)*(.*)/;
+ };
push @l, { info => $vendor . ' ' . $model, host => $host, channel => $channel, id => $id, lun => $lun,
description => join('|', $vendor, $model),
bus => 'SCSI', media_type => $media_type, device => $device,