diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2001-11-12 15:29:25 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2001-11-12 15:29:25 +0000 |
| commit | a45b2f1b459b4046d3a73ce0a46d8c386ae6c60b (patch) | |
| tree | b9c006e4b80ce63884847672541b728dc62b5256 | |
| parent | 684d6df5cd365618159c9cd1ebb514730a370b2f (diff) | |
| download | drakx-a45b2f1b459b4046d3a73ce0a46d8c386ae6c60b.tar drakx-a45b2f1b459b4046d3a73ce0a46d8c386ae6c60b.tar.gz drakx-a45b2f1b459b4046d3a73ce0a46d8c386ae6c60b.tar.bz2 drakx-a45b2f1b459b4046d3a73ce0a46d8c386ae6c60b.tar.xz drakx-a45b2f1b459b4046d3a73ce0a46d8c386ae6c60b.zip | |
- Misc merges from HEAD
| -rw-r--r-- | perl-install/detect_devices.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |