diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-02-25 13:36:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-02-25 13:36:54 +0000 |
| commit | 08a7f5ef90f4a633066fe9fe8bc2fb235b60e63d (patch) | |
| tree | 14d3bedb00dd5ea8b413d654879e3a90c2b47425 /perl-install/install2.pm | |
| parent | 4e8251d54488afe7034c34152a0099917752aff3 (diff) | |
| download | drakx-backup-do-not-use-08a7f5ef90f4a633066fe9fe8bc2fb235b60e63d.tar drakx-backup-do-not-use-08a7f5ef90f4a633066fe9fe8bc2fb235b60e63d.tar.gz drakx-backup-do-not-use-08a7f5ef90f4a633066fe9fe8bc2fb235b60e63d.tar.bz2 drakx-backup-do-not-use-08a7f5ef90f4a633066fe9fe8bc2fb235b60e63d.tar.xz drakx-backup-do-not-use-08a7f5ef90f4a633066fe9fe8bc2fb235b60e63d.zip | |
(main): move the load_deps before all the loadO's
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index c168b7299..581d8bec2 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -455,12 +455,21 @@ sub main { eval { spawnShell() }; + $o->{prefix} = $::testing ? "/tmp/test-perl-install" : $::live ? "" : "/mnt"; + mkdir $o->{prefix}, 0755; + + modules::unload($_) foreach qw(vfat msdos fat); + modules::load_deps(($::testing ? ".." : "") . "/modules/modules.dep"); + modules::read_stage1_conf($_) foreach "/tmp/conf.modules", "/etc/modules.conf"; + modules::read_already_loaded(); + $o->{interactive} ||= 'gtk'; if ($o->{interactive} eq "gtk" && availableMemory < 22 * 1024) { log::l("switching to newt install cuz not enough memory"); $o->{interactive} = "newt"; } + #- done after module dependencies are loaded for "vfat depends on fat" if ($::auto_install) { require install_steps_auto_install; eval { $o = $::o = install_any::loadO($o, $::auto_install) }; @@ -476,15 +485,6 @@ sub main { require"install_steps_$o->{interactive}.pm"; } - $o->{prefix} = $::testing ? "/tmp/test-perl-install" : $::live ? "" : "/mnt"; - mkdir $o->{prefix}, 0755; - - modules::unload($_) foreach qw(vfat msdos fat); - modules::load_deps(($::testing ? ".." : "") . "/modules/modules.dep"); - modules::read_stage1_conf($_) foreach "/tmp/conf.modules", "/etc/modules.conf"; - modules::read_already_loaded(); - - #- done after module dependencies are loaded for "vfat depends on fat" eval { $o = $::o = install_any::loadO($o, "patch") } if $patch; eval { $o = $::o = install_any::loadO($o, $cfg) } if $cfg; |