From 8345f0f682cad316e95b7d16a190dfdf25dd4d8a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 4 Sep 2007 16:54:48 +0000 Subject: (getSCSI) enumerate generic SCSI devices again --- perl-install/detect_devices.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/detect_devices.pm') 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/../../../.."; -- cgit v1.2.1