From a45b2f1b459b4046d3a73ce0a46d8c386ae6c60b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Mon, 12 Nov 2001 15:29:25 +0000
Subject: - Misc merges from HEAD

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

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 5e0fd1441..0c6913655 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") };
     my @scsi = grep { $_->{media_type} eq 'fd' } getSCSI();
     @ide, @scsi, @fds;
 }
-- 
cgit v1.2.1