diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-01-14 18:59:41 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-01-14 18:59:41 +0000 |
| commit | 385e53fcc9f82c256f03a7fa199476426527b886 (patch) | |
| tree | 9ae30b3c7116b3b9997d05800bfbcb21cf6e689a | |
| parent | 624881792f21f84c9ec817c541bbc6307622cf7b (diff) | |
| download | drakx-385e53fcc9f82c256f03a7fa199476426527b886.tar drakx-385e53fcc9f82c256f03a7fa199476426527b886.tar.gz drakx-385e53fcc9f82c256f03a7fa199476426527b886.tar.bz2 drakx-385e53fcc9f82c256f03a7fa199476426527b886.tar.xz drakx-385e53fcc9f82c256f03a7fa199476426527b886.zip | |
since dmidecode can fail to properly detect a floppy drive, don't use it during install (where we don't care if it's a bit slow)
| -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 9b058f525..443e0e6be 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -55,7 +55,7 @@ sub floppies() { my @fds; my @dmis = dmidecode(); # do not try to load floppy if there's no floppy drive: - if (!@dmis || find { $_->{'Internal Reference Designator'} =~ /^(FLOPPY|FDD)$/ && $_->{name} eq 'Port Connector' } @dmis) { + if ($::isInstall || !@dmis || find { $_->{'Internal Reference Designator'} =~ /^(FLOPPY|FDD)$/ && $_->{name} eq 'Port Connector' } @dmis) { eval { modules::load("floppy") if $::isInstall }; if (!$@) { @fds = map { |