diff options
Diffstat (limited to 'perl-install/modules.pm')
| -rw-r--r-- | perl-install/modules.pm | 10 |
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 |