diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-05-04 05:13:17 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-05-04 05:13:17 +0000 |
| commit | cd986fb35d446cbc8027c777ce68a0d85ded4576 (patch) | |
| tree | b36b0611a0de979f96872b5559dceb4684490606 | |
| parent | a40d88910f0b00596e578200618b750795b59862 (diff) | |
| download | drakx-cd986fb35d446cbc8027c777ce68a0d85ded4576.tar drakx-cd986fb35d446cbc8027c777ce68a0d85ded4576.tar.gz drakx-cd986fb35d446cbc8027c777ce68a0d85ded4576.tar.bz2 drakx-cd986fb35d446cbc8027c777ce68a0d85ded4576.tar.xz drakx-cd986fb35d446cbc8027c777ce68a0d85ded4576.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 4e27848ee..79fd47345 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -55,7 +55,7 @@ sub cdroms() { } sub floppies() { my @ide = map { $_->{device} } ls120s() and modules::load("ide-floppy"); - my @scsi, map { $_->{device} } usbfdus(); + my @scsi = map { $_->{device} } usbfdus(); (@ide, @scsi, grep { tryOpen($_) } qw(fd0 fd1)); } #- example ls120, model = "LS-120 SLIM 02 UHD Floppy" diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 0e3ea2dc5..07f32e780 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -546,7 +546,7 @@ sub load_thiskind($;&$) { #- probe for USB SCSI, make sure keyboard is allowed. if (my ($c) = grep { /usb-/ } map { $_->[1] } pci_probing::main::probe('')) { - eval { load($c, "SERIAL_USB"); load("usbkbd"); load("keybdev"); load("usb-storage", $type); sleep(1); }; + eval { load($c, "SERIAL_USB"); load("usbkbd"); load("keybdev"); load("usb-storage", $type); sleep(2); }; -d "/proc/scsi/usb" or unload("usb-storage"); } #- probe for parport SCSI. |