diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2000-02-27 23:08:44 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2000-02-27 23:08:44 +0000 |
commit | a4b844e4c4ef101c4a79e4831a36f0ff51bd1f32 (patch) | |
tree | 9c9debe426c01444b7bd0975d1e3923d0a2c641f /perl-install/detect_devices.pm | |
parent | 1c0127d9f80cb91dc16a212f7380f3a45381c0df (diff) | |
download | drakx-a4b844e4c4ef101c4a79e4831a36f0ff51bd1f32.tar drakx-a4b844e4c4ef101c4a79e4831a36f0ff51bd1f32.tar.gz drakx-a4b844e4c4ef101c4a79e4831a36f0ff51bd1f32.tar.bz2 drakx-a4b844e4c4ef101c4a79e4831a36f0ff51bd1f32.tar.xz drakx-a4b844e4c4ef101c4a79e4831a36f0ff51bd1f32.zip |
no_comment
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r-- | perl-install/detect_devices.pm | 11 |
1 files changed, 9 insertions, 2 deletions
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; } |