From 5c418b40c0ac75beb326399b31b3533271bcf48d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 18 Sep 2000 12:26:54 +0000
Subject: no_comment

---
 perl-install/detect_devices.pm | 5 +++--
 1 file changed, 3 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 319975db3..d62999b4b 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -45,11 +45,12 @@ sub cdroms() {
     my @l = grep { $_->{type} eq 'cdrom' } get(); 
     if (my @l2 = getIDEBurners()) {
 	require modules;
-	my $nb = first(modules::add_alias('scsi_hostadapter', 'ide-scsi') =~ /(\d*)/) + 1;
+	modules::add_alias('scsi_hostadapter', 'ide-scsi');
+	my $nb = 1 + max(-1, map { $_->{device} =~ /scd(\d+)/ } @l);
 	foreach my $b (@l2) {
 	    log::l("getIDEBurners: $b");
 	    my ($e) = grep { $_->{device} eq $b } @l or next;
-	    $e->{device} = "scd" . ($nb++ || 0);
+	    $e->{device} = "scd" . $nb++;
 	}
     }
     @l;
-- 
cgit v1.2.1