summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-05-23 18:27:47 +0000
committerThierry Vignaud <tv@mageia.org>2012-05-23 18:27:47 +0000
commit5bd8788a9a667a2a6c474e562f98ccfb9b694f0b (patch)
tree09148cfffa2c56bded8aba263fad3290807163bf /perl-install
parentbb5f453fef173d6c6c28775c842f6f75386f5bfc (diff)
downloaddrakx-5bd8788a9a667a2a6c474e562f98ccfb9b694f0b.tar
drakx-5bd8788a9a667a2a6c474e562f98ccfb9b694f0b.tar.gz
drakx-5bd8788a9a667a2a6c474e562f98ccfb9b694f0b.tar.bz2
drakx-5bd8788a9a667a2a6c474e562f98ccfb9b694f0b.tar.xz
drakx-5bd8788a9a667a2a6c474e562f98ccfb9b694f0b.zip
(init_modules_conf) split it out of main()
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/install2.pm14
1 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 556630fa0..4fa6f4811 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -541,6 +541,14 @@ sub init_mouse() {
mouse::load_modules($o->{mouse});
}
+sub init_modules_conf() {
+ list_modules::load_default_moddeps();
+ require modules::any_conf;
+ require modules::modules_conf;
+ $o->{modules_conf} = modules::modules_conf::read(modules::any_conf::vnew(), '/tmp/modules.conf');
+ modules::read_already_loaded($o->{modules_conf});
+}
+
sub process_auto_steps() {
foreach (@::auto_steps) {
if (my $s = $o->{steps}{/::(.*)/ ? $1 : $_}) {
@@ -601,11 +609,7 @@ sub main {
eval { install::any::spawnShell() };
- list_modules::load_default_moddeps();
- require modules::any_conf;
- require modules::modules_conf;
- $o->{modules_conf} = modules::modules_conf::read(modules::any_conf::vnew(), '/tmp/modules.conf');
- modules::read_already_loaded($o->{modules_conf});
+ init_modules_conf();
#- done before auto_install is called to allow the -IP feature on auto_install file name
read_stage1_net_conf() if -e '/tmp/network';