diff options
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 3977f4683..1e8240f99 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -2,6 +2,8 @@ available (network installs) (#30344) - do not try to configure dvd devices since /dev is wiped out at reboot +- fix detecting usb drives (#13395) + (need a new perl-MDK-Common) - hw support: o handle snd-cs5530 driver - install fonts-ttf-dejavu & fonts-ttf-liberation by default diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 9191c454a..8d6a9f116 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -75,11 +75,14 @@ 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 - my $retry = 10; - sleep 1; #- TOREMOVE for compatibility with previous behaviour: wait at least 2 seconds - while ($retry--) { + + #- 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; - last if all('/sys/bus/scsi/devices'); log::l("waiting for usb-storage devices to appear (retry = $retry)"); } } |