From 08a7f5ef90f4a633066fe9fe8bc2fb235b60e63d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 25 Feb 2001 13:36:54 +0000
Subject: (main): move the load_deps before all the loadO's

---
 perl-install/install2.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'perl-install/install2.pm')

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;
 
-- 
cgit v1.2.1