summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-28 21:23:35 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-28 21:23:35 +0000
commitc38c6b14952c25b51b1c0f9fa05aec2d34dc8ddf (patch)
tree6ab9fab8ff9e4273ce051c7947877e38c1c08ea6 /perl-install/install2.pm
parentdbb92fc24abd933eff171909db38d78e1d2f40c6 (diff)
downloaddrakx-c38c6b14952c25b51b1c0f9fa05aec2d34dc8ddf.tar
drakx-c38c6b14952c25b51b1c0f9fa05aec2d34dc8ddf.tar.gz
drakx-c38c6b14952c25b51b1c0f9fa05aec2d34dc8ddf.tar.bz2
drakx-c38c6b14952c25b51b1c0f9fa05aec2d34dc8ddf.tar.xz
drakx-c38c6b14952c25b51b1c0f9fa05aec2d34dc8ddf.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 8f8666f02..a9e22535b 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -619,11 +619,11 @@ sub main {
}
modules::unload($_) foreach qw(vfat msdos fat);
- modules::load_deps("/modules/modules.dep");
+ modules::load_deps(($::testing ? ".." : "") . "/modules/modules.dep");
modules::read_stage1_conf("/tmp/conf.modules");
modules::read_already_loaded();
- eval { modules::load($_, 'prereq') } foreach qw(ide-probe ide-disk ide-cd sd_mod af_packet);
+ modules::load_multi(qw(ide-probe ide-disk ide-cd sd_mod af_packet));
install_any::lnx4win_preinstall() if $o->{lnx4win};
#-the main cycle