summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-08 23:09:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-08 23:09:32 +0000
commit15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3 (patch)
tree5fa84300a4af2638286890e21751c3090c6d2d4b /perl-install/detect_devices.pm
parentcbb0bae07578f66abc44d3adb26f9e90cf6c8581 (diff)
downloaddrakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.tar
drakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.tar.gz
drakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.tar.bz2
drakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.tar.xz
drakx-15cde5c25f4ec7b5b8121d8a13ab9fe7c105e4b3.zip
no_comment
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index c1333f34e..484a4dfe8 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -38,13 +38,13 @@ sub zips() { grep { $_->{type} eq 'hd' && isZipDrive($_) } get(); }
#-sub jazzs() { grep { $_->{type} eq 'hd' && isJazDrive($_) } get(); }
sub cdroms() {
my @l = grep { $_->{type} eq 'cdrom' } get();
- if (getIDEBurners()) {
+ if (my @l2 = getIDEBurners()) {
require modules;
- my $nb = modules::add_alias('scsi_hostadapter', 'ide-scsi') =~ /(\d+)/;
- foreach my $b (getIDEBurners()) {
+ my ($nb) = modules::add_alias('scsi_hostadapter', 'ide-scsi') =~ /(\d*)/;
+ foreach my $b (@l2) {
log::l("getIDEBurners: $b");
my ($e) = grep { $_->{device} eq $b } @l or next;
- $e->{device} = "scd" . $nb++;
+ $e->{device} = "scd" . ($nb++ || 0);
}
}
@l;