diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-03-03 20:15:51 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-03-03 20:15:51 +0000 |
| commit | 047cb33ce06a701da00a7ae6bb236558b7aaeabb (patch) | |
| tree | 809d45b17c2119288458e3f6b0bdf19a0839ecd9 | |
| parent | 44492735b3c15650c1d492dd4c8b17fc903ecc01 (diff) | |
| download | drakx-047cb33ce06a701da00a7ae6bb236558b7aaeabb.tar drakx-047cb33ce06a701da00a7ae6bb236558b7aaeabb.tar.gz drakx-047cb33ce06a701da00a7ae6bb236558b7aaeabb.tar.bz2 drakx-047cb33ce06a701da00a7ae6bb236558b7aaeabb.tar.xz drakx-047cb33ce06a701da00a7ae6bb236558b7aaeabb.zip | |
(getSCSI) adapt to new kernel-2.6.25's sysfs layout (Eric Pielbug, #38235)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 59e926262..636cf78ee 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- adapt to new kernel-2.6.25's sysfs layout (Eric Pielbug, #38235) - select proper padlock module for Via CPU (#38311) Version 10.7 - 3 March 2008 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/../../../.."; |