From 047cb33ce06a701da00a7ae6bb236558b7aaeabb Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 3 Mar 2008 20:15:51 +0000
Subject: (getSCSI) adapt to new kernel-2.6.25's sysfs layout (Eric Pielbug,
 #38235)

---
 perl-install/detect_devices.pm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'perl-install/detect_devices.pm')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 8f81e45bb..6e9f21ce1 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -201,6 +201,9 @@ sub getSCSI() {
 	# handle both old and new kernels:
 	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)/(.*)!;
+        if (!$device) {
+            ($device) = top(glob_("$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