summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-07 02:05:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-07 02:05:00 +0000
commitdbba4bdb651ed70c3b76b570f49516a9426dd0cf (patch)
tree404e046ee51d985187c72ca602f283bb598ebb78
parent71b1c0207f7ed73fcac2e98a79367ec808bb0110 (diff)
downloaddrakx-backup-do-not-use-dbba4bdb651ed70c3b76b570f49516a9426dd0cf.tar
drakx-backup-do-not-use-dbba4bdb651ed70c3b76b570f49516a9426dd0cf.tar.gz
drakx-backup-do-not-use-dbba4bdb651ed70c3b76b570f49516a9426dd0cf.tar.bz2
drakx-backup-do-not-use-dbba4bdb651ed70c3b76b570f49516a9426dd0cf.tar.xz
drakx-backup-do-not-use-dbba4bdb651ed70c3b76b570f49516a9426dd0cf.zip
create write_preload_conf()
-rw-r--r--perl-install/modules.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 8f4c52d79..7bc173d4f 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -321,6 +321,13 @@ sub write_conf() {
if $v2 && !$written->{$mod}{$type};
}
}
+ #- use module-init-tools script for the moment
+ run_program::rooted($::prefix, "/sbin/generate-modprobe.conf", ">", "/etc/modprobe.conf") if -e "$::prefix/etc/modprobe.conf";
+
+ write_preload_conf();
+}
+
+sub write_preload_conf() {
my @l;
push @l, 'scsi_hostadapter' if !is_empty_array_ref($conf{scsi_hostadapter}{probeall});
push @l, grep { detect_devices::matching_driver("^$_\$") } qw(bttv cx8800 saa7134);
@@ -330,8 +337,6 @@ sub write_conf() {
}
append_to_modules_loaded_at_startup("$::prefix/etc/modules", @l);
append_to_modules_loaded_at_startup("$::prefix/etc/modprobe.preload", @l_26);
- #- use module-init-tools script for the moment
- run_program::rooted($::prefix, "/sbin/generate-modprobe.conf", ">", "/etc/modprobe.conf") if -e "$::prefix/etc/modprobe.conf";
}
sub append_to_modules_loaded_at_startup {