From 3dacb4c999fe9423d8b2300186139374868f042e 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         | 2 +-
 perl-install/standalone/XFdrake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index d7216cfd1..fccd3b24e 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -281,7 +281,7 @@ sub mergein_conf_raw {
 	push @{$conf{$key}{probeall} ||= []}, deref($value->{probeall});
     }
 }
-sub mergein_conf {
+sub mergein_conf() {
     my $file = "$::prefix/etc/modules.conf";
     mergein_conf_raw($file) if -r $file;
 }
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 90a78d1b0..cbe4bc569 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -39,7 +39,7 @@ $configure_this ||= 'everything';
 { 
     my $in = 'interactive'->vnew('su');
 
-    modules::mergein_conf() if -r '/etc/modules.conf';
+    modules::mergein_conf();
 
     my $rc = do {
 	my $options = { allowFB => listlength(cat_("/proc/fb")) };
-- 
cgit v1.2.1