diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:47 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:47 +0000 |
| commit | 3f00eb699804da35c0545c25a6f5f3f500c18e7d (patch) | |
| tree | 09148cfffa2c56bded8aba263fad3290807163bf /perl-install | |
| parent | ca9fd0b06b9ee7fc09097145019f8828a93256c2 (diff) | |
| download | drakx-backup-do-not-use-3f00eb699804da35c0545c25a6f5f3f500c18e7d.tar drakx-backup-do-not-use-3f00eb699804da35c0545c25a6f5f3f500c18e7d.tar.gz drakx-backup-do-not-use-3f00eb699804da35c0545c25a6f5f3f500c18e7d.tar.bz2 drakx-backup-do-not-use-3f00eb699804da35c0545c25a6f5f3f500c18e7d.tar.xz drakx-backup-do-not-use-3f00eb699804da35c0545c25a6f5f3f500c18e7d.zip | |
(init_modules_conf) split it out of main()
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/install2.pm | 14 |
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'; |