diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-12-19 13:24:17 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-12-19 13:24:17 +0000 |
| commit | f5ae79d660f0fbba0a542eab584added25f92eee (patch) | |
| tree | 732e3528bd76db289ca46626f629628b4e049d29 /perl-install/detect_devices.pm | |
| parent | 6eb2abd201f1856896558e44459a8238bde8d20e (diff) | |
| download | drakx-f5ae79d660f0fbba0a542eab584added25f92eee.tar drakx-f5ae79d660f0fbba0a542eab584added25f92eee.tar.gz drakx-f5ae79d660f0fbba0a542eab584added25f92eee.tar.bz2 drakx-f5ae79d660f0fbba0a542eab584added25f92eee.tar.xz drakx-f5ae79d660f0fbba0a542eab584added25f92eee.zip | |
(getSCSI_26) handle kernel-2.6.14+
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index fb92a15ba..d143b12c0 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -289,7 +289,8 @@ sub getSCSI_26() { my $usb_dir = readlink("$dir/block/device") =~ m!/usb! && "$dir/block/device/../../../.."; my $get_usb = sub { chomp_(cat_("$usb_dir/$_[0]")) }; - my ($device) = readlink("$dir/block") =~ m!/block/(.*)!; + my $node = -e "$dir/block" ? "$dir/block" : top(glob_("$dir/block*")); + my ($device) = readlink($node) =~ m!/block/(.*)!; my $media_type = ${{ st => 'tape', sr => 'cdrom', sd => 'hd' }}{substr($device, 0, 2)}; # Old hp scanners report themselves as "Processor"s |