summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-27 06:56:15 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-27 06:56:15 +0000
commitbc454df43584bf596b467a6d55e59f65cf3063a4 (patch)
treed4598528771f45e41b8e3a941e64b566172993a1
parent118c294ad22290f91c9d48c8c75d3daae5eba506 (diff)
downloaddrakx-bc454df43584bf596b467a6d55e59f65cf3063a4.tar
drakx-bc454df43584bf596b467a6d55e59f65cf3063a4.tar.gz
drakx-bc454df43584bf596b467a6d55e59f65cf3063a4.tar.bz2
drakx-bc454df43584bf596b467a6d55e59f65cf3063a4.tar.xz
drakx-bc454df43584bf596b467a6d55e59f65cf3063a4.zip
read modules configuration file from stage1 as modules_conf file, but
get an object of the proper type by using modules::any_conf::vnew
-rw-r--r--perl-install/install2.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 57ef9fe3c..363ec01b7 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -457,8 +457,9 @@ sub main {
eval { spawnShell() };
modules::load_dependencies(($::testing ? ".." : "") . "/modules/modules.dep");
+ require modules::any_conf;
require modules::modules_conf;
- $o->{modules_conf} = modules::modules_conf->read('/tmp/modules.conf');
+ $o->{modules_conf} = modules::modules_conf::read(modules::any_conf::vnew(), '/tmp/modules.conf');
modules::read_already_loaded($o->{modules_conf});
#- done before auto_install is called to allow the -IP feature on auto_install file name