summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-07 07:21:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-07 07:21:04 +0000
commit89e2c0f66b7aac23562cac0c22a3b71f388fe568 (patch)
tree30cddc6802f479466a92af9e5b89a77c8139095f /perl-install/modules.pm
parentdd69bb2017f7dad5911f7117b7863f20baae83b1 (diff)
downloaddrakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar
drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.gz
drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.bz2
drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.xz
drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.zip
modules::mergein_conf() doesn't need to be given /etc/modules.conf
=> prepare for reading either modprobe.conf or modules.conf based on the running kernel version
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index d8180256f..d7216cfd1 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -272,7 +272,7 @@ sub read_conf {
\%c;
}
-sub mergein_conf {
+sub mergein_conf_raw {
my ($file) = @_;
my $modconfref = read_conf($file);
while (my ($key, $value) = each %$modconfref) {
@@ -281,6 +281,10 @@ sub mergein_conf {
push @{$conf{$key}{probeall} ||= []}, deref($value->{probeall});
}
}
+sub mergein_conf {
+ my $file = "$::prefix/etc/modules.conf";
+ mergein_conf_raw($file) if -r $file;
+}
sub write_conf() {
my $file = "$::prefix/etc/modules.conf";
@@ -348,10 +352,6 @@ sub append_to_modules_loaded_at_startup {
} $file;
}
-sub read_stage1_conf {
- mergein_conf($_[0]);
-}
-
#-###############################################################################
#- internal functions