From a4b844e4c4ef101c4a79e4831a36f0ff51bd1f32 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 27 Feb 2000 23:08:44 +0000
Subject: no_comment

---
 perl-install/detect_devices.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'perl-install/detect_devices.pm')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index a8653a9ff..84b74d2e0 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -36,7 +36,15 @@ sub get {
 sub hds() { grep { $_->{type} eq 'hd' && ($::isStandalone || !isRemovableDrive($_)) } get(); }
 sub zips() { grep { $_->{type} eq 'hd' && isZipDrive($_) } get(); }
 #-sub jazzs() { grep { $_->{type} eq 'hd' && isJazDrive($_) } get(); }
-sub cdroms() { grep { $_->{type} eq 'cdrom' } get(); }
+sub cdroms() { 
+    my @l = grep { $_->{type} eq 'cdrom' } get(); 
+    my $nb = $modules::scsi; #- this is gross!
+    foreach (getIDEBurners()) {
+	my ($e) = grep { $_->{device} eq $_ } @l or next;
+	$e->{device} = "scd" . ($nb++ || '');
+    }
+    @l;
+}
 sub floppies() {
     (grep { tryOpen($_) } qw(fd0 fd1)),
     (grep { $_->{type} eq 'fd' } get());
@@ -100,7 +108,6 @@ sub getIDE() {
 	my $num = ord (($d =~ /(.)$/)[0]) - ord 'a';
 	push @idi, { type => $type, device => basename($d), info => $info, bus => $num/2, id => $num%2 };
     }
-    #- push @idi, { type => 'hd', device => 'hde', info => 'ZIP 100', bus => '1', id => 1 } if $::testing;
     @idi;
 }
 
-- 
cgit v1.2.1