summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry.Vignaud <thierry.vignaud@gmail.com>2014-06-19 14:29:14 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-06-19 18:45:47 +0200
commit05bb76e87d8c08d30ae6bf69c86bc7572fa7c9b9 (patch)
treef9a31fcdec40bc7fe058d02fb5d4b50dcef99267
parent9c81fd807ec210e12649f84ef50bb75b4a600c08 (diff)
downloaddrakx-05bb76e87d8c08d30ae6bf69c86bc7572fa7c9b9.tar
drakx-05bb76e87d8c08d30ae6bf69c86bc7572fa7c9b9.tar.gz
drakx-05bb76e87d8c08d30ae6bf69c86bc7572fa7c9b9.tar.bz2
drakx-05bb76e87d8c08d30ae6bf69c86bc7572fa7c9b9.tar.xz
drakx-05bb76e87d8c08d30ae6bf69c86bc7572fa7c9b9.zip
make sure udev had time to create device nodes
-rw-r--r--perl-install/detect_devices.pm5
-rw-r--r--perl-install/install/NEWS2
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 49cfd2346..deac44714 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -100,7 +100,10 @@ sub floppies {
if (!$o_not_detect_legacy_floppies && !$legacy_already_detected) {
$legacy_already_detected = 1;
- eval { modules::load("floppy") if $::isInstall };
+ if ($::isInstall) {
+ eval { modules::load("floppy") };
+ system(qw(udevadm settle)) if !$@;
+ }
#- 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)
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3e14067cd..5bc9129d2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- let udev handle floppies
+
Version 16.33 - 18 June 2014
- stop creating some /dev entries that are managed by udev