summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-09-06 02:44:15 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-09-06 02:44:15 +0000
commitfe1822dc5f8d78dc5696c274cf114473efd5584e (patch)
treebc1c95246a1107692c654a9ee7a8d4ce8f8b4c4a
parentf55cc79408ffe0be4c50ac72f5f9761c96a9d8c4 (diff)
downloaddrakx-fe1822dc5f8d78dc5696c274cf114473efd5584e.tar
drakx-fe1822dc5f8d78dc5696c274cf114473efd5584e.tar.gz
drakx-fe1822dc5f8d78dc5696c274cf114473efd5584e.tar.bz2
drakx-fe1822dc5f8d78dc5696c274cf114473efd5584e.tar.xz
drakx-fe1822dc5f8d78dc5696c274cf114473efd5584e.zip
add module for storage controllers that are not compiled built-in in kernel
-rw-r--r--perl-install/harddrake/data.pm6
-rw-r--r--perl-install/modules.pm2
-rwxr-xr-xperl-install/standalone/service_harddrake4
3 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 058f0eab5..f0add06a9 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -290,7 +290,7 @@ our @tree =
icon => "ide_hd.png",
configurator => "",
detector => sub { f(grep { $_->{media_type} =~ /STORAGE_(IDE|OTHER)/ || $_->{driver} eq '3w-xxxx' } @devices) },
- checked_on_boot => 0,
+ checked_on_boot => 1,
},
{
@@ -299,7 +299,7 @@ our @tree =
icon => "ide_hd.png",
configurator => "",
detector => sub { f(grep { $_->{driver} =~ /^sata/ } @devices) },
- checked_on_boot => 0,
+ checked_on_boot => 1,
},
{
@@ -330,7 +330,7 @@ our @tree =
icon => "scsi.png",
configurator => "",
detector => sub { f(grep { $_->{media_type} =~ /STORAGE_SCSI/ || $_->{driver} eq 'megaraid' } @devices) },
- checked_on_boot => 0,
+ checked_on_boot => 1,
},
{
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index b33617a41..619db5084 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -233,7 +233,7 @@ sub when_load {
sub when_load_category {
my ($conf, $name, $category) = @_;
- if ($category =~ m,disk/(scsi|hardware_raid|usb|firewire),) {
+ if ($category =~ m,disk/(ide|scsi|hardware_raid|usb|firewire),) {
$conf->add_probeall('scsi_hostadapter', $name);
eval { load('sd_mod') };
} elsif ($category eq 'bus/usb') {
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 8cf58da6e..1b241b8cb 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -119,7 +119,7 @@ foreach my $hw_class (@harddrake::data::tree) {
require network::ethernet;
network::ethernet::configure_eth_aliases($modules_conf);
$modules_conf->write;
- } elsif ($Ident eq "AGP") {
+ } elsif (member($Ident qw(AGP ATA_STORAGE SATA_STORAGE SCSI_CONTROLLER TV)) {
# add agpgart modules to modprobe.preload if needed:
$modules_conf->write;
} elsif ($Ident eq "USB_CONTROLLER") {
@@ -129,8 +129,6 @@ foreach my $hw_class (@harddrake::data::tree) {
require harddrake::autoconf;
harddrake::autoconf::xconf($modules_conf, {});
next;
- } elsif ($Ident eq "TV") {
- $modules_conf->write;
}
next if $is_globetrotter && !$hw_class->{automatic};