summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-08-20 01:06:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-08-20 01:06:22 +0000
commitb3dabf3d3b06cba33edfd9d8bd418d7d36614086 (patch)
tree6ed14918fce230de0e728eec2c301797dff014ca /perl-install
parent2c43cf115f517fc50c13386258317f8678d54023 (diff)
downloaddrakx-b3dabf3d3b06cba33edfd9d8bd418d7d36614086.tar
drakx-b3dabf3d3b06cba33edfd9d8bd418d7d36614086.tar.gz
drakx-b3dabf3d3b06cba33edfd9d8bd418d7d36614086.tar.bz2
drakx-b3dabf3d3b06cba33edfd9d8bd418d7d36614086.tar.xz
drakx-b3dabf3d3b06cba33edfd9d8bd418d7d36614086.zip
load detected firewire modules during install
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/install_steps_interactive.pm4
-rw-r--r--perl-install/modules.pm2
3 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 12bda07b9..f0f9b452f 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -146,7 +146,7 @@ sub setupSCSI {
modules::configure_pcmcia($o->{pcmcia}) if $o->{pcmcia};
modules::load_ide();
modules::load_category('bus/firewire');
- modules::load_category('disk/scsi|hardware_raid');
+ modules::load_category('disk/scsi|hardware_raid|firewire');
install_any::getHds($o, $o);
}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 50499e384..3acdd345f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -235,8 +235,8 @@ sub setupSCSI {
modules::interactive::load_category($o, '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, '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!
+ modules::interactive::load_category($o, 'disk/scsi|hardware_raid|firewire', 1, !$have_non_scsi);
+ modules::interactive::load_category($o, 'disk/scsi|hardware_raid|firewire') if !detect_devices::hds(); #- we really want a disk!
install_interactive::tellAboutProprietaryModules($o);
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 01b6b9c1a..f9db94709 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -363,7 +363,7 @@ sub when_load {
$conf{$name}{options} = join " ", @options if @options;
if (my $category = module2category($name)) {
- if ($category =~ m,disk/(scsi|hardware_raid|usb),) {
+ if ($category =~ m,disk/(scsi|hardware_raid|usb|firewire),) {
add_probeall('scsi_hostadapter', $name);
eval { load('sd_mod') };
}