summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/modules.pm11
2 files changed, 2 insertions, 10 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3ce5eabd9..f4004c38e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- add support for XZ modules
+- faster & safer waiting for end of USB modules
- include gtk20 translations (caps lock & the like)
- diskdrake:
o enable to set LV names when not in expert mode
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 53f70b055..6b3e90616 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -99,16 +99,7 @@ sub load_raw {
} elsif (member('usb_storage', @$l)) {
#- usb_storage is only modprobed when we know there is some scsi devices
#- so trying hard to wait for devices to be detected
-
- #- first sleep the minimum time usb-stor-scan takes
- sleep 5; #- 5 == /sys/module/usb_storage/parameters/delay_use
- # then wait for usb-stor-scan to complete
- my $retry = 0;
- while ($retry++ < 10) {
- fuzzy_pidofs('usb-stor-scan') or last;
- sleep 1;
- log::l("waiting for usb_storage devices to appear (retry = $retry)");
- }
+ run_program::run('udevadm', 'settle');
}
}
sub load_with_options {