From a3a015c348486f1f91dbf150a0925887157d6dd1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 9 Oct 2001 13:56:10 +0000
Subject: ensure floppies() takes care of usb-storage if possible, so that
 patch on usb floppy works

---
 perl-install/detect_devices.pm | 4 +++-
 perl-install/install2.pm       | 3 ++-
 perl-install/modules.pm        | 2 +-
 3 files changed, 6 insertions(+), 3 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, {});
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index a2d52ea20..165d69b5a 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -448,6 +448,8 @@ sub main {
     }
     require"install_steps_$o->{interactive}.pm" if $o->{interactive}; #- no space to skip perl2fcalls
 
+    # needed before accessing floppy (in case of usb floppy)
+    $::noauto or modules::load_thiskind("usb"); 
  
     eval { $o = $::o = install_any::loadO($o, "patch") } if $patch;
     eval { $o = $::o = install_any::loadO($o, $cfg) } if $cfg;
@@ -459,7 +461,6 @@ sub main {
     } modules::get_that_type('sound');
 
     #- needed very early for install_steps_gtk
-    $::noauto or modules::load_thiskind("usb"); 
     eval { ($o->{mouse}, @{$o->{wacom} = []}) = mouse::detect() } unless $o->{nomouseprobe} || $o->{mouse};
 
     $o->{lang} = lang::set($o->{lang}); #- mainly for defcfg
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 9b8a363a4..d2c71fecb 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -746,7 +746,7 @@ sub load_thiskind {
     my @try_modules = (
       if_($type =~ /scsi/,
 	  if_(arch() !~ /ppc/, 'imm', 'ppa'),
-	  if_(detect_devices::usbZips(), 'usb-storage'),
+	  if_(detect_devices::usbStorage(), 'usb-storage'),
       ),
       if_(arch() =~ /ppc/, 
 	  if_($type =~ /scsi/, 'mesh', 'mac53c94'),
-- 
cgit v1.2.1