From 89e2c0f66b7aac23562cac0c22a3b71f388fe568 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 7 Jul 2004 07:21:04 +0000
Subject: 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

---
 perl-install/modules.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

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