(floppies) do not use dmidecode for detecting floppies since it's not

reliable (#15029)

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") };