summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-08-22 10:58:28 +0000
committerOlivier Blin <oblin@mandriva.com>2008-08-22 10:58:28 +0000
commitb3fda9dd95fa45190d3f81cf613c5bda1a246c92 (patch)
treed412cf5f6028a4ed272bfae110184f49802861f7 /perl-install
parent774971b457d530e35b27873c07d344b91477d508 (diff)
downloaddrakx-b3fda9dd95fa45190d3f81cf613c5bda1a246c92.tar
drakx-b3fda9dd95fa45190d3f81cf613c5bda1a246c92.tar.gz
drakx-b3fda9dd95fa45190d3f81cf613c5bda1a246c92.tar.bz2
drakx-b3fda9dd95fa45190d3f81cf613c5bda1a246c92.tar.xz
drakx-b3fda9dd95fa45190d3f81cf613c5bda1a246c92.zip
do not bother probing /dev/fd0 and loading floppy device uselessly,
it takes time and it is already done by boot process (just check /proc/devices)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/detect_devices.pm6
2 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ed3f0af9b..d33d7794f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,7 @@
- probe floppies only once
+- do not bother probing /dev/fd0 and loading floppy device uselessly,
+ it takes time and it is already done by boot process
+ (just check /proc/devices)
Version 11.21 - 21 August 2008
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 79f7f625d..731523786 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -56,7 +56,11 @@ sub floppies {
if (!$o_not_detect_legacy_floppies && !$legacy_already_detected) {
$legacy_already_detected = 1;
eval { modules::load("floppy") if $::isInstall };
- if (!is_xbox()) {
+ #- do not bother probing /dev/fd0 and loading floppy device uselessly,
+ #- it takes time and it is already done by boot process (if not in install):
+ #- /dev/fd0 is created by start_udev (/etc/udev/devices.d/default.nodes)
+ #- then hal probes /dev/fd0 and triggers floppy module loading through kernel's kmod
+ if (any { (split)[1] eq 'fd' } cat_("/proc/devices")) {
@fds = map {
my $info = c::floppy_info(devices::make("fd$_"));
if_($info && $info ne '(null)', { device => "fd$_", media_type => 'fd', info => $info });