diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-09-04 16:54:48 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-09-04 16:54:48 +0000 |
| commit | 8345f0f682cad316e95b7d16a190dfdf25dd4d8a (patch) | |
| tree | 62e2ad938eb9c7283abc409392c76a8aff2f4fb6 /perl-install | |
| parent | 83c16b08e3db456d383c1aed28249e46e33a0cbb (diff) | |
| download | drakx-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')
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 29963982c..5361d0118 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,6 @@ -- add support for tape device again (#31073) +- hardware detection layer: + o add support for tape device again (#31073) + o enumerate generic SCSI devices again - diskdrake o add a comment (a la ubuntu) in fstab when using UUID= 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/../../../.."; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index eb0d6b09d..85b96248d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,7 @@ -- add support for tape device again (#31073) +- hardware detection layer: + o add support for tape device again (#31073) + o enumerate generic SCSI devices again +- enumerate generic SCSI devices again Version 10.4.187- 4 September 2007, by Pascal "Pixel" Rigaux |