From 89e2c0f66b7aac23562cac0c22a3b71f388fe568 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 7 Jul 2004 07:21:04 +0000 Subject: modules::mergein_conf() doesn't need to be given /etc/modules.conf => prepare for reading either modprobe.conf or modules.conf based on the running kernel version --- perl-install/install2.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl-install/install2.pm') diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 7ca1e9c17..b8f57432a 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -457,7 +457,7 @@ sub main { eval { spawnShell() }; modules::load_dependencies(($::testing ? ".." : "") . "/modules/modules.dep"); - modules::read_stage1_conf('/tmp/modules.conf'); + modules::mergein_conf_raw('/tmp/modules.conf'); modules::read_already_loaded(); #- done before auto_install is called to allow the -IP feature on auto_install file name -- cgit v1.2.1