summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-08 21:37:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-08 21:37:12 +0000
commitc18a38b267cdf53ec8cdd005b3c87b631856860a (patch)
tree9cf3b5bd895b93558937ccd8c022ab59aa40160c /perl-install
parente47e462b821bc2c587bc34c4c132e1d37219648b (diff)
downloaddrakx-c18a38b267cdf53ec8cdd005b3c87b631856860a.tar
drakx-c18a38b267cdf53ec8cdd005b3c87b631856860a.tar.gz
drakx-c18a38b267cdf53ec8cdd005b3c87b631856860a.tar.bz2
drakx-c18a38b267cdf53ec8cdd005b3c87b631856860a.tar.xz
drakx-c18a38b267cdf53ec8cdd005b3c87b631856860a.zip
(floppies): load module "floppy" before probing
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/detect_devices.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index a38917d5b..ddcbe5e42 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -56,9 +56,11 @@ sub IDEburners { grep { $_->{type} eq 'cdrom' && isBurner($_->{device}) } getIDE
sub floppies() {
require modules;
+ eval { modules::load("floppy") };
+ my @fds = grep { tryOpen($_) } qw(fd0 fd1);
my @ide = map { $_->{device} } ls120s() and modules::load("ide-floppy");
my @scsi = map { $_->{device} } usbfdus();
- (@ide, @scsi, grep { tryOpen($_) } qw(fd0 fd1));
+ (@ide, @scsi, @fds);
}
sub floppy { first(floppies()) }
#- example ls120, model = "LS-120 SLIM 02 UHD Floppy"