summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-03-03 14:26:59 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-03-03 14:26:59 +0000
commita24e0b7c4824a2b0deac0ba6a32e02b9c412c9ba (patch)
tree44621b51f823bb84516c88aff9a1de50fcff3227 /perl-install
parent5f5c40b9b515a39a82e6b08308d97102eddc0934 (diff)
downloaddrakx-backup-do-not-use-a24e0b7c4824a2b0deac0ba6a32e02b9c412c9ba.tar
drakx-backup-do-not-use-a24e0b7c4824a2b0deac0ba6a32e02b9c412c9ba.tar.gz
drakx-backup-do-not-use-a24e0b7c4824a2b0deac0ba6a32e02b9c412c9ba.tar.bz2
drakx-backup-do-not-use-a24e0b7c4824a2b0deac0ba6a32e02b9c412c9ba.tar.xz
drakx-backup-do-not-use-a24e0b7c4824a2b0deac0ba6a32e02b9c412c9ba.zip
- remove a warning
- better scsi bus location
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/harddrake24
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index b38ce41d2..4437fa5e6 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -267,10 +267,10 @@ foreach (@harddrake::data::tree) {
if ($_->{bus} eq 'ide') {
$_->{channel} = $_->{channel} ? N("secondary") : N("primary");
delete $_->{info};
- } elsif ($_->{bus} !~ /USB|PCI/) {
+ } elsif ($_->{bus} && $_->{bus} !~ /USB|PCI/) {
# SCSI detection incoherency:
my $i = $_;
- $_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_}) } qw(bus id);
+ $_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_}) } qw(channel id lun);
}
harddrake::data::set_removable_configurator($Ident, $_, \$configurator);
if ($Ident eq "AUDIO") {