diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-10-09 13:56:10 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-10-09 13:56:10 +0000 |
| commit | a3a015c348486f1f91dbf150a0925887157d6dd1 (patch) | |
| tree | 5b5ef8d358bfa24a4ab84a462a7707021d5e10dd /perl-install/detect_devices.pm | |
| parent | cce82543244847bc44ccdd9d116e2fd04599f14c (diff) | |
| download | drakx-a3a015c348486f1f91dbf150a0925887157d6dd1.tar drakx-a3a015c348486f1f91dbf150a0925887157d6dd1.tar.gz drakx-a3a015c348486f1f91dbf150a0925887157d6dd1.tar.bz2 drakx-a3a015c348486f1f91dbf150a0925887157d6dd1.tar.xz drakx-a3a015c348486f1f91dbf150a0925887157d6dd1.zip | |
ensure floppies() takes care of usb-storage if possible, so that patch on usb floppy works
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index a517303ee..1c6537bd1 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -83,6 +83,8 @@ sub floppies() { if_($info && $info ne '(null)', { device => $_, media_type => 'fd', info => $info }) } qw(fd0 fd1); my @ide = ls120s() and modules::load("ide-floppy"); + + eval { modules::load("usb-storage") } if usbStorage(); my @scsi = grep { $_->{media_type} eq 'fd' } getSCSI(); @ide, @scsi, @fds; } @@ -352,7 +354,7 @@ sub whatParport() { sub usbMice { grep { $_->{media_type} =~ /\|Mouse/ && $_->{driver} !~ /Tablet:wacom/} usb_probe() } sub usbWacom { grep { $_->{driver} =~ /Tablet:wacom/ } usb_probe() } sub usbKeyboards { grep { $_->{media_type} =~ /\|Keyboard/ } usb_probe() } -sub usbZips { grep { $_->{media_type} =~ /Mass Storage\|/ } usb_probe() } +sub usbStorage { grep { $_->{media_type} =~ /Mass Storage\|/ } usb_probe() } sub whatUsbport() { my ($i, $elem, @res) = (0, {}); |