summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-09-03 04:32:23 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-09-03 04:32:23 +0000
commit785c0f0823be768ecc0c5163358496d105b083c5 (patch)
tree08ce6cdc64273f5ba000d79aff9961707c917b69
parent2d199c980e717516209a3c90bb36535e306dbc61 (diff)
downloaddrakx-785c0f0823be768ecc0c5163358496d105b083c5.tar
drakx-785c0f0823be768ecc0c5163358496d105b083c5.tar.gz
drakx-785c0f0823be768ecc0c5163358496d105b083c5.tar.bz2
drakx-785c0f0823be768ecc0c5163358496d105b083c5.tar.xz
drakx-785c0f0823be768ecc0c5163358496d105b083c5.zip
(setupSCSI) load modularized PATA drivers too
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/install_steps_interactive.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index c561cb124..258c852c7 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -157,7 +157,7 @@ sub setupSCSI {
install_any::configure_pcmcia($o->{modules_conf}, $o->{pcmcia}) if $o->{pcmcia};
modules::load(modules::category2modules('disk/cdrom'));
modules::load_category($o->{modules_conf}, 'bus/firewire');
- modules::load_category($o->{modules_conf}, 'disk/scsi|hardware_raid|firewire');
+ modules::load_category($o->{modules_conf}, 'disk/ide|scsi|hardware_raid|firewire');
install_any::getHds($o);
}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6221cda4f..7f2ca6a2f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -241,8 +241,8 @@ sub setupSCSI {
modules::interactive::load_category($o, $o->{modules_conf}, 'bus/firewire', 1);
my $have_non_scsi = detect_devices::hds(); #- at_least_one scsi device if we have no disks
- modules::interactive::load_category($o, $o->{modules_conf}, 'disk/scsi|hardware_raid|firewire', 1, !$have_non_scsi);
- modules::interactive::load_category($o, $o->{modules_conf}, 'disk/scsi|hardware_raid|firewire') if !detect_devices::hds(); #- we really want a disk!
+ modules::interactive::load_category($o, $o->{modules_conf}, 'disk/ide|scsi|hardware_raid|firewire', 1, !$have_non_scsi);
+ modules::interactive::load_category($o, $o->{modules_conf}, 'disk/ide|scsi|hardware_raid|firewire') if !detect_devices::hds(); #- we really want a disk!
install_interactive::tellAboutProprietaryModules($o);