(setupSCSI): handle calling modules::interactive::load_category in

non-automatic mode when no harddrives are found

1 files changed, 4 insertions, 2 deletions

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 41abe8653..92304fb3d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -214,9 +214,11 @@ sub setupSCSI {
     }
     modules::interactive::load_category($o, 'bus/firewire', 1);
 
-    modules::interactive::load_category($o, 'disk/scsi|hardware_raid', !$::expert && !$clicked, 0);
+    my $have_non_scsi = detect_devices::hds(); #- at_least_one scsi device if we have no disks
+    modules::interactive::load_category($o, 'disk/scsi|hardware_raid', 1, !$have_non_scsi);
+    modules::interactive::load_category($o, 'disk/scsi|hardware_raid') if !detect_devices::hds(); #- we really want a disk!
 
-    install_interactive::tellAboutProprietaryModules($o) if !$clicked;
+    install_interactive::tellAboutProprietaryModules($o);
 
     install_any::getHds($o, $o);
 }