summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-03-22 21:06:05 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-03-22 21:06:05 +0000
commit44e7ea56795982e16cd0a6ceda3161d2b57324cc (patch)
treedfa9e91625742bdc1549eef9c62edd7a1ca9707f
parent5d14a8d3f9cb5107a46d5f1a27e1a1b166bf7356 (diff)
downloaddrakx-44e7ea56795982e16cd0a6ceda3161d2b57324cc.tar
drakx-44e7ea56795982e16cd0a6ceda3161d2b57324cc.tar.gz
drakx-44e7ea56795982e16cd0a6ceda3161d2b57324cc.tar.bz2
drakx-44e7ea56795982e16cd0a6ceda3161d2b57324cc.tar.xz
drakx-44e7ea56795982e16cd0a6ceda3161d2b57324cc.zip
detect_devices: only look at valid scsi devices in /sys
-rw-r--r--perl-install/NEWS5
-rw-r--r--perl-install/detect_devices.pm4
2 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4842fc7e7..2c2d067b2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,7 @@
-Versino 12.17.1 - 21 March 2009
+- detect_devices:
+ o only look at valid scsi devices in /sys
+
+Version 12.17.1 - 21 March 2009
- fix syntax error in nb translation file
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 78348856f..643f3a376 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -202,7 +202,9 @@ sub getSCSI() {
my @l;
foreach (all($dev_dir)) {
- my ($host, $channel, $id, $lun) = split ':' or log::l("bad entry in $dev_dir: $_"), next;
+ my ($host, $channel, $id, $lun) = split ':';
+ defined $lun or log::l("bad entry in $dev_dir: $_"), next;
+
my $dir = "$dev_dir/$_";
# handle both old and new kernels: