From a24e0b7c4824a2b0deac0ba6a32e02b9c412c9ba Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 3 Mar 2003 14:26:59 +0000
Subject: - remove a warning - better scsi bus location

---
 perl-install/standalone/harddrake2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/standalone')

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") {
-- 
cgit v1.2.1