summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-23 12:43:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-23 12:43:55 +0000
commit0819e26934c32525355de5248b890043bd798794 (patch)
tree562e40c6e52c82426e88f5c5de888663fe2271d4
parent030ccaf05de11e1b7897c170988bd6596fed8a55 (diff)
downloaddrakx-0819e26934c32525355de5248b890043bd798794.tar
drakx-0819e26934c32525355de5248b890043bd798794.tar.gz
drakx-0819e26934c32525355de5248b890043bd798794.tar.bz2
drakx-0819e26934c32525355de5248b890043bd798794.tar.xz
drakx-0819e26934c32525355de5248b890043bd798794.zip
(setupSCSI): handle calling modules::interactive::load_category in
non-automatic mode when no harddrives are found
-rw-r--r--perl-install/install_steps_interactive.pm6
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);
}