summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-22 10:21:51 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-22 10:21:51 +0000
commit269838c2a216037037dfef470471971d46e852d2 (patch)
treeefa5490b645cafe70651650e20d5df497e75f38f /perl-install
parentba110b48b47d9e5e39c81c2f508eb71b35a960d1 (diff)
downloaddrakx-269838c2a216037037dfef470471971d46e852d2.tar
drakx-269838c2a216037037dfef470471971d46e852d2.tar.gz
drakx-269838c2a216037037dfef470471971d46e852d2.tar.bz2
drakx-269838c2a216037037dfef470471971d46e852d2.tar.xz
drakx-269838c2a216037037dfef470471971d46e852d2.zip
(floppies) probe floppies only once
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/detect_devices.pm5
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 477a9fa7a..ed3f0af9b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- probe floppies only once
+
Version 11.21 - 21 August 2008
- diskdrake
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 354dfeb7c..79f7f625d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -13,6 +13,7 @@ use devices;
use run_program;
use modules;
use c;
+use feature 'state';
#-#####################################################################################
#- Globals
@@ -51,7 +52,9 @@ sub floppies {
my ($o_not_detect_legacy_floppies) = @_;
require modules;
my @fds;
- if (!$o_not_detect_legacy_floppies) {
+ state $legacy_already_detected;
+ if (!$o_not_detect_legacy_floppies && !$legacy_already_detected) {
+ $legacy_already_detected = 1;
eval { modules::load("floppy") if $::isInstall };
if (!is_xbox()) {
@fds = map {