diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-01-20 19:12:48 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-01-20 19:12:48 +0000 |
| commit | bc652fca0120181720fbe92fcfbb44076eadbb6b (patch) | |
| tree | ba730f32946c5dcc18b6b49965280d0fd7b74dff | |
| parent | 232627e4ab2e268a0cb80947e2884f7afcedb869 (diff) | |
| download | drakx-bc652fca0120181720fbe92fcfbb44076eadbb6b.tar drakx-bc652fca0120181720fbe92fcfbb44076eadbb6b.tar.gz drakx-bc652fca0120181720fbe92fcfbb44076eadbb6b.tar.bz2 drakx-bc652fca0120181720fbe92fcfbb44076eadbb6b.tar.xz drakx-bc652fca0120181720fbe92fcfbb44076eadbb6b.zip | |
(load_raw) faster & safer waiting for end of USB modules
(thanks to now having udev)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/modules.pm | 11 |
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 { |