summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-10-18 21:25:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-10-18 21:25:04 +0000
commitb2f9aa5f68ea530d58ba4043a352b71c29cf352e (patch)
tree48670528d397fb9601209dd0ec21a0b409d36489
parent5e0a50de40764a52f5c6f48d1951f88cc5c90d84 (diff)
downloaddrakx-b2f9aa5f68ea530d58ba4043a352b71c29cf352e.tar
drakx-b2f9aa5f68ea530d58ba4043a352b71c29cf352e.tar.gz
drakx-b2f9aa5f68ea530d58ba4043a352b71c29cf352e.tar.bz2
drakx-b2f9aa5f68ea530d58ba4043a352b71c29cf352e.tar.xz
drakx-b2f9aa5f68ea530d58ba4043a352b71c29cf352e.zip
safer modprobe ide-floppy
-rw-r--r--perl-install/detect_devices.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 1c6537bd1..0fa9297aa 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -82,7 +82,7 @@ sub floppies() {
my $info = (!dev_is_devfs() || -e "/dev/$_") && c::floppy_info(devices::make($_));
if_($info && $info ne '(null)', { device => $_, media_type => 'fd', info => $info })
} qw(fd0 fd1);
- my @ide = ls120s() and modules::load("ide-floppy");
+ my @ide = ls120s() and eval { modules::load("ide-floppy") };
eval { modules::load("usb-storage") } if usbStorage();
my @scsi = grep { $_->{media_type} eq 'fd' } getSCSI();