summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-04 16:54:48 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-04 16:54:48 +0000
commit8345f0f682cad316e95b7d16a190dfdf25dd4d8a (patch)
tree62e2ad938eb9c7283abc409392c76a8aff2f4fb6 /perl-install/detect_devices.pm
parent83c16b08e3db456d383c1aed28249e46e33a0cbb (diff)
downloaddrakx-8345f0f682cad316e95b7d16a190dfdf25dd4d8a.tar
drakx-8345f0f682cad316e95b7d16a190dfdf25dd4d8a.tar.gz
drakx-8345f0f682cad316e95b7d16a190dfdf25dd4d8a.tar.bz2
drakx-8345f0f682cad316e95b7d16a190dfdf25dd4d8a.tar.xz
drakx-8345f0f682cad316e95b7d16a190dfdf25dd4d8a.zip
(getSCSI) enumerate generic SCSI devices again
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index d142a4963..981bd9d6b 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -199,8 +199,8 @@ sub getSCSI() {
my $dir = "$dev_dir/$_";
# handle both old and new kernels:
- my $node = find { -e $_ } "$dir/block", top(glob_("$dir/block*")), "$dir/tape";
- my ($device) = readlink($node) =~ m!/(?:scsi_tape|block)/(.*)!;
+ my $node = find { -e $_ } "$dir/block", top(glob_("$dir/block*")), "$dir/tape", top(glob_("$dir/scsi_generic*"));
+ my ($device) = readlink($node) =~ m!/(?:scsi_(?:generic|tape)|block)/(.*)!;
warn("cannot get info for device ($_)"), next if !$device;
my $usb_dir = readlink("$node/device") =~ m!/usb! && "$node/device/../../../..";