summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2006-02-16 13:57:19 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2006-02-16 13:57:19 +0000
commit36d67c3db4662570eae249f991de6e137fd3014b (patch)
tree4eb000f82cf6b6b2721d15a1094720bac553465c
parent01c0f56e97e0b45f0c3502cbbfe406f810bf891a (diff)
downloaddrakx-36d67c3db4662570eae249f991de6e137fd3014b.tar
drakx-36d67c3db4662570eae249f991de6e137fd3014b.tar.gz
drakx-36d67c3db4662570eae249f991de6e137fd3014b.tar.bz2
drakx-36d67c3db4662570eae249f991de6e137fd3014b.tar.xz
drakx-36d67c3db4662570eae249f991de6e137fd3014b.zip
- fix adding storage controllers: set scsi_hostadapter like DrakX does instead
of trying preloading the driver - manage hardware_raid class too
-rwxr-xr-xperl-install/standalone/service_harddrake12
1 files changed, 11 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index ea3ef77ea..bc0462823 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -139,7 +139,17 @@ foreach my $hw_class (@harddrake::data::tree) {
network::ethernet::configure_eth_aliases($modules_conf);
$modules_conf->write;
next;
- } elsif (member($Ident, qw(AGP ATA_STORAGE DVB SATA_STORAGE SCSI_CONTROLLER TV))) {
+ } elsif (member($Ident, qw(ATA_STORAGE RAID_STORAGE SATA_STORAGE SCSI_CONTROLLER))) {
+ # set scsi_hostadapterr in modprobe.conf:
+ modules::load_category($modules_conf, 'disk/' . {
+ ATA_STORAGE => 'ide',
+ SATA_STORAGE => 'sata',
+ SCSI_CONTROLLER => 'scsi',
+ RAID_STORAGE => 'hardware_raid',
+ }->{$Ident});
+ $modules_conf->write;
+ next;
+ } elsif (member($Ident, qw(AGP DVB TV))) {
my @old_drivers = uniq(map { $_->{driver} } values %$oldconfig);
my @new_drivers = uniq(map { $_->{driver} } values %ID);
$modules_conf->remove_module(difference2(\@old_drivers, \@new_drivers));