summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-08 11:46:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-08 11:46:53 +0000
commit51bd47f1ed237706a216df1f797b5dae5d038455 (patch)
treea3a09f759c1466f9ef0ef49afdb48714790b8b9b
parentabde4998e2b15674e2ac98a244bd608ab0958f0a (diff)
downloaddrakx-51bd47f1ed237706a216df1f797b5dae5d038455.tar
drakx-51bd47f1ed237706a216df1f797b5dae5d038455.tar.gz
drakx-51bd47f1ed237706a216df1f797b5dae5d038455.tar.bz2
drakx-51bd47f1ed237706a216df1f797b5dae5d038455.tar.xz
drakx-51bd47f1ed237706a216df1f797b5dae5d038455.zip
(write_conf): put "probeall scsi-hosts scsi_hostadapter ..."
-rw-r--r--perl-install/modules.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 58ae7e276..2d03a93af 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -666,6 +666,9 @@ sub write_conf {
my $file = "$prefix/etc/modules.conf";
rename "$prefix/etc/conf.modules", $file; #- make the switch to new name if needed
+ my @scsi_hostadapters = $scsi ? map { "scsi_hostadapter$_" } ('', 1..$scsi-1) : ();
+ $conf{'scsi-hosts'}{probeall} = join(' ', @scsi_hostadapters) if @scsi_hostadapters;
+
#- remove the post-install supermount stuff. We now do it in /etc/modules
#- Substitute new aliases in modules.conf (if config has changed)
substInFile { $_ = '' if /^post-install supermount/ } $file;
@@ -687,7 +690,7 @@ sub write_conf {
print F "$type $mod $v2\n" if $v2 && $type ne "loaded" && !$written->{$mod}{$type};
}
}
- my @l = map { "scsi_hostadapter$_" } '', 1..$scsi-1 if $scsi;
+ my @l = ();
push @l, 'ide-floppy' if detect_devices::ide_zips();
push @l, 'bttv' if grep { $_->{driver} eq 'bttv' } detect_devices::probeall();
my $l = join '|', @l;