diff options
author | Thierry Vignaud <tv@mandriva.org> | 2010-01-18 12:15:29 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2010-01-18 12:15:29 +0000 |
commit | 8ad6e2b4b7ded156280a69a81984f53216a31401 (patch) | |
tree | 85b0010d035fa096b2a034f9bd21ee0550880a01 /perl-install | |
parent | 2f67ead989a9e817ca2273315f8d4ab9fbaacc33 (diff) | |
download | drakx-8ad6e2b4b7ded156280a69a81984f53216a31401.tar drakx-8ad6e2b4b7ded156280a69a81984f53216a31401.tar.gz drakx-8ad6e2b4b7ded156280a69a81984f53216a31401.tar.bz2 drakx-8ad6e2b4b7ded156280a69a81984f53216a31401.tar.xz drakx-8ad6e2b4b7ded156280a69a81984f53216a31401.zip |
rename %eide_hds as %hd_vendors since it better document what it is
Diffstat (limited to 'perl-install')
-rw-r--r-- | perl-install/detect_devices.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 5b09c494a..e94fab50d 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -19,7 +19,7 @@ use feature 'state'; #-##################################################################################### #- Globals #-##################################################################################### -my (%serialprobe, %eide_hds); +my (%serialprobe, %hd_vendors); #-###################################################################################### #- Functions @@ -235,9 +235,9 @@ sub getSCSI() { $raw_type =~ /Scanner|Processor/ && 'scanner'; my ($vendor, $model) = ($get->('vendor'), $get->('model')); - foreach my $name (keys %eide_hds) { + foreach my $name (keys %hd_vendors) { next if !$name; - ($vendor, $model) = ($eide_hds{$name}, $2) if $model =~ /^$name(-|\s)*(.*)/; + ($vendor, $model) = ($hd_vendors{$name}, $2) if $model =~ /^$name(-|\s)*(.*)/; }; push @l, { info => $vendor . ' ' . $model, host => $host, channel => $channel, id => $id, lun => $lun, description => join('|', $vendor, $model), @@ -262,7 +262,7 @@ sub getSCSI() { } -%eide_hds = ( +%hd_vendors = ( "ASUS" => "Asus", "CD-ROM CDU" => "Sony", "CD-ROM Drive/F5D" => "ASUSTeK", @@ -305,8 +305,8 @@ sub getIDE() { my $num = ord(($d =~ /(.)$/)[0]) - ord 'a'; my ($vendor, $model) = map { - if_($info =~ /^$_(-|\s)*(.*)/, $eide_hds{$_}, $2); - } keys %eide_hds; + if_($info =~ /^$_(-|\s)*(.*)/, $hd_vendors{$_}, $2); + } keys %hd_vendors; my $host = $num; ($host, my $id) = divide($host, 2); |