- have usb-storage as a scsi_hostadapter by default

- remove it if unneeded for normal boot (cf comment in the code)

1 files changed, 10 insertions, 0 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 7783c7238..bfd6b5229 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -191,6 +191,16 @@ sub formatPartitions {
 
     any::rotate_logs($o->{prefix});
 
+    if (find { $_->{usb_media_type} && find { $_->{mntpoint} } partition_table::get_normal_parts($_) } @{$o->{all_hds}{hds}}) {
+	log::l("we use a usb-storage based drive, so keep it as a normal scsi_hostadapter");
+    } else {
+	log::l("we don't need usb-storage for booting system, rely on hotplug");
+	#- when usb-storage is in scsi_hostadapter, 
+	#- hotplug + scsimon do not load sd_mod/sr_mod when needed
+	#- (eg: when plugging a usb key)
+	modules::remove_probeall('scsi_hostadapter', 'usb-storage');
+    }
+
     require raid;
     raid::prepare_prefixed($o->{all_hds}{raids}, $o->{prefix});
 }