From 50a4988ce2ef7000b220d2395dc6a45e5f478cfd Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 21 Aug 2007 14:46:48 +0000
Subject: use usb_storage instead of usb-storage

---
 perl-install/detect_devices.pm | 2 +-
 perl-install/harddrake/data.pm | 2 +-
 perl-install/install/any.pm    | 2 +-
 perl-install/modules.pm        | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index b706d76da..b58768f95 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -63,7 +63,7 @@ sub floppies {
         
     my @ide = ls120s() and eval { modules::load("ide-floppy") };
 
-    eval { modules::load("usb-storage") } if $::isInstall && usbStorage();
+    eval { modules::load("usb_storage") } if $::isInstall && usbStorage();
     my @scsi = grep { $_->{media_type} eq 'fd' } getSCSI();
     @ide, @scsi, @fds;
 }
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index cec74e79f..373745800 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -386,7 +386,7 @@ our @tree =
       string => N("USB Mass Storage Devices"),
       icon => "usb.png",
       configurator => "",
-      detector => sub { f(grep { member($_->{driver}, qw(usb-storage ub)) } @devices) },
+      detector => sub { f(grep { member($_->{driver}, qw(usb_storage ub)) } @devices) },
       checked_on_boot => 0,
      },
 
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 3f47b3c82..00ed63d85 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -1097,7 +1097,7 @@ sub getHds {
 }
 
 sub removable_media__early_in_install() {
-    eval { modules::load('usb-storage', 'sd_mod') } if detect_devices::usbStorage();
+    eval { modules::load('usb_storage', 'sd_mod') } if detect_devices::usbStorage();
     my $all_hds = fsedit::get_hds({});
     fs::get_raw_hds('', $all_hds);
 
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 96fb86203..01a88a18c 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -72,8 +72,8 @@ sub load_raw {
     }
     if (any { /^(mousedev|printer)$/ } @$l) {
 	sleep 2;
-    } elsif (member('usb-storage', @$l)) {
-	#- usb-storage is only modprobed when we know there is some scsi devices
+    } 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
@@ -83,7 +83,7 @@ sub load_raw {
 	while ($retry++ < 10) { 
 	    fuzzy_pidofs('usb-stor-scan') or last;
 	    sleep 1;
-	    log::l("waiting for usb-storage devices to appear (retry = $retry)");
+	    log::l("waiting for usb_storage devices to appear (retry = $retry)");
 	}
     }
 }
@@ -135,7 +135,7 @@ sub load_category {
 
     my @try_modules = (
       if_($category =~ /scsi/,
-	  if_(detect_devices::usbStorage(), 'usb-storage'),
+	  if_(detect_devices::usbStorage(), 'usb_storage'),
       ),
       arch() =~ /ppc/ ? (
 	  if_($category =~ /scsi/,
-- 
cgit v1.2.1