summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-03-29 10:29:32 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-03-29 10:29:32 +0000
commitc1db574910bb0521115ca96252e9df66120fa43c (patch)
treefa26b6700db01ae30db03f4949e8c0915e3c7515 /perl-install
parentc35f9c9f2d33a5067c297188d7b99a08bb6b5a91 (diff)
downloaddrakx-c1db574910bb0521115ca96252e9df66120fa43c.tar
drakx-c1db574910bb0521115ca96252e9df66120fa43c.tar.gz
drakx-c1db574910bb0521115ca96252e9df66120fa43c.tar.bz2
drakx-c1db574910bb0521115ca96252e9df66120fa43c.tar.xz
drakx-c1db574910bb0521115ca96252e9df66120fa43c.zip
(floppies) do not use dmidecode for detecting floppies since it's not
reliable (#15029)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/detect_devices.pm16
1 files changed, 6 insertions, 10 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 3bbcfc8a3..1da4b5565 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -54,16 +54,12 @@ sub zips() {
sub floppies() {
require modules;
my @fds;
- my @dmis = dmidecode();
- # do not try to load floppy if there's no floppy drive:
- if (!is_xbox() && ($::isInstall || !@dmis || find { $_->{'Internal Reference Designator'} =~ /^(FLOPPY|FDD)$/ && $_->{name} eq 'Port Connector' } @dmis)) {
- eval { modules::load("floppy") if $::isInstall };
- if (!$@) {
- @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);
- }
+ eval { modules::load("floppy") if $::isInstall };
+ if (!is_xbox()) {
+ @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") };