summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-10 13:05:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-10 13:05:21 +0000
commit7af00be13aa97e120426fc1cd260f4a71f3c8078 (patch)
treebbf75f8febbd3bf4eee22202c5a484ab1009a38c
parentfd3a5de4499efbb2627d00e3c436141d9a7c32fb (diff)
downloaddrakx-7af00be13aa97e120426fc1cd260f4a71f3c8078.tar
drakx-7af00be13aa97e120426fc1cd260f4a71f3c8078.tar.gz
drakx-7af00be13aa97e120426fc1cd260f4a71f3c8078.tar.bz2
drakx-7af00be13aa97e120426fc1cd260f4a71f3c8078.tar.xz
drakx-7af00be13aa97e120426fc1cd260f4a71f3c8078.zip
fix ide-scsi appearing 2 times when standalone because both in /proc/ide
and /proc/scsi/scsi
-rw-r--r--perl-install/detect_devices.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index f98e1034a..8d26f3cd5 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -153,6 +153,7 @@ sub getIDE() {
#- Great. 2.2 kernel, things are much easier and less error prone.
foreach my $d (sort @{[glob_('/proc/ide/hd*')]}) {
+ cat_("$d/driver") =~ /ide-scsi/ and next; #- already appears in /proc/scsi/scsi
my $t = chomp_(cat_("$d/media"));
my $type = $ {{disk => 'hd', cdrom => 'cdrom', tape => 'tape', floppy => 'fd'}}{$t} or next;
my $info = chomp_(cat_("$d/model")) || "(none)";