summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-04 16:48:20 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-04 16:48:20 +0000
commit83c16b08e3db456d383c1aed28249e46e33a0cbb (patch)
tree740ef41cecff6008aefabcf1d2f0d41bf40d187b
parent1a1957081f6832670f4210bf502d0a9fc2c9a770 (diff)
downloaddrakx-backup-do-not-use-83c16b08e3db456d383c1aed28249e46e33a0cbb.tar
drakx-backup-do-not-use-83c16b08e3db456d383c1aed28249e46e33a0cbb.tar.gz
drakx-backup-do-not-use-83c16b08e3db456d383c1aed28249e46e33a0cbb.tar.bz2
drakx-backup-do-not-use-83c16b08e3db456d383c1aed28249e46e33a0cbb.tar.xz
drakx-backup-do-not-use-83c16b08e3db456d383c1aed28249e46e33a0cbb.zip
(getSCSI) add support for tape device again (#31073)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/detect_devices.pm4
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3a32078e2..29963982c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- add support for tape device again (#31073)
- 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 7857ead77..d142a4963 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 = -e "$dir/block" ? "$dir/block" : top(glob_("$dir/block*"));
- my ($device) = readlink($node) =~ m!/block/(.*)!;
+ my $node = find { -e $_ } "$dir/block", top(glob_("$dir/block*")), "$dir/tape";
+ my ($device) = readlink($node) =~ m!/(?:scsi_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 67a1a5329..eb0d6b09d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- add support for tape device again (#31073)
+
Version 10.4.187- 4 September 2007, by Pascal "Pixel" Rigaux
- bugfix: add desktop-Custom.png to tarball