summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-11 18:23:44 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-11 18:23:44 +0000
commit08135ef65a4f8d3e3c5ccf4707f4199d335eeaa9 (patch)
treec69f1ef6bbb287bd625ad0a1df0c5ce9c63de82d
parent090f4f7cc9f47b30df5c004f6d3b142ebcf5d92b (diff)
downloaddrakx-08135ef65a4f8d3e3c5ccf4707f4199d335eeaa9.tar
drakx-08135ef65a4f8d3e3c5ccf4707f4199d335eeaa9.tar.gz
drakx-08135ef65a4f8d3e3c5ccf4707f4199d335eeaa9.tar.bz2
drakx-08135ef65a4f8d3e3c5ccf4707f4199d335eeaa9.tar.xz
drakx-08135ef65a4f8d3e3c5ccf4707f4199d335eeaa9.zip
(floppies): module "floppy" can fail to insmod, in that case it means
there's no floppy controller, so don't try fd0 & fd1 which may cause havoc (esp. segfault) (thanks to rcc)
-rw-r--r--perl-install/detect_devices.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 7ecbd6f5e..51d7cd5ae 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -83,10 +83,11 @@ sub zips__faking_ide_scsi {
sub floppies() {
require modules;
eval { modules::load("floppy") };
- my @fds = map {
+ my @fds = $@ ? () : map {
my $info = (!dev_is_devfs() || -e "/dev/fd$_") && c::floppy_info(devices::make("fd$_"));
if_($info && $info ne '(null)', { device => "fd$_", devfs_device => "floppy/$_", media_type => 'fd', info => $info })
} qw(0 1);
+
my @ide = ls120s() and eval { modules::load("ide-floppy") };
eval { modules::load("usb-storage") } if usbStorage();