From 08135ef65a4f8d3e3c5ccf4707f4199d335eeaa9 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sun, 11 Aug 2002 18:23:44 +0000 Subject: (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) --- perl-install/detect_devices.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(); -- cgit v1.2.1