From b2f9aa5f68ea530d58ba4043a352b71c29cf352e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 18 Oct 2001 21:25:04 +0000
Subject: safer modprobe ide-floppy

---
 perl-install/detect_devices.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/detect_devices.pm')

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();
-- 
cgit v1.2.1