summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-02-11 22:57:22 +0000
committerOlivier Blin <oblin@mandriva.com>2008-02-11 22:57:22 +0000
commit51520013f354af4aec254206eb3d74f327bf5101 (patch)
tree879c2df0fc410bf95df9fa09e3dc9db7d4ccbc57
parent2e2e813745c9920603ae259e97563c66d6d9ddc6 (diff)
downloaddrakx-51520013f354af4aec254206eb3d74f327bf5101.tar
drakx-51520013f354af4aec254206eb3d74f327bf5101.tar.gz
drakx-51520013f354af4aec254206eb3d74f327bf5101.tar.bz2
drakx-51520013f354af4aec254206eb3d74f327bf5101.tar.xz
drakx-51520013f354af4aec254206eb3d74f327bf5101.zip
use list_modules::load_default_moddeps instead of loading hardcoded /modules/modules.dep
-rw-r--r--perl-install/install/commands.pm4
-rw-r--r--perl-install/install/install2.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/commands.pm b/perl-install/install/commands.pm
index 982667d20..4f19a1a2d 100644
--- a/perl-install/install/commands.pm
+++ b/perl-install/install/commands.pm
@@ -295,7 +295,7 @@ sub modprobe {
$h || @_ == 0 and die "usage: modprobe <module> [options]\n";
my $name = shift;
require modules;
- modules::load_dependencies("/modules/modules.dep");
+ list_modules::load_default_moddeps();
modules::load_with_options([ $name ], { $name => join(' ', @_) });
}
@@ -401,7 +401,7 @@ sub bug {
require any;
require modules;
- modules::load_dependencies("/modules/modules.dep");
+ list_modules::load_default_moddeps();
my $part;
if ($o_part_device) {
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 871dadfbb..269dd5b7e 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -420,7 +420,7 @@ sub main {
eval { install::any::spawnShell() };
- modules::load_dependencies("/modules/modules.dep");
+ 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');