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/standalone/XFdrake           | 2 +-
 perl-install/standalone/draksound         | 2 +-
 perl-install/standalone/drakxtv           | 2 +-
 perl-install/standalone/mousedrake        | 2 +-
 perl-install/standalone/printerdrake      | 2 +-
 perl-install/standalone/service_harddrake | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index d0d977628..90a78d1b0 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('/etc/modules.conf') if -r '/etc/modules.conf';
+    modules::mergein_conf() if -r '/etc/modules.conf';
 
     my $rc = do {
 	my $options = { allowFB => listlength(cat_("/proc/fb")) };
diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound
index e52c3e518..3d5ff85e0 100755
--- a/perl-install/standalone/draksound
+++ b/perl-install/standalone/draksound
@@ -29,7 +29,7 @@ use detect_devices;
 
 my $in = 'interactive'->vnew('su');
 
-modules::mergein_conf('/etc/modules.conf');
+modules::mergein_conf();
 
 my @devices = grep { $_->{media_type} eq 'MULTIMEDIA_AUDIO' } detect_devices::probeall();
 if (@devices) {
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index b07fee392..888815632 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -121,7 +121,7 @@ if (@devices) {
 	   if (($< == 0 || $::testing) && (grep { detect_devices::isTVcard($_) } @devices)) {
 		  require harddrake::v4l;
 		  require modules;
-		  modules::mergein_conf('/etc/modules.conf') if !$configured;
+		  modules::mergein_conf() if !$configured;
 		  $configured++;
 		  $not_canceled &&= harddrake::v4l::config($in, $_->{driver});
 		  modules::write_conf();
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index d7bb98729..19d104f95 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -13,7 +13,7 @@ use c;
 
 my $in = 'interactive'->vnew('su');
 
-modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf';
+modules::mergein_conf();
 
 begin:
 my $mouse = mouse::read();
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 00ebf6288..aceb4940a 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -103,7 +103,7 @@ $commandline =~ /-lprng/ and
     $printer->{SPOOLER} = 'lprng' and printer::main::read_configured_queues($printer);
 $commandline =~ /-pdq/ and 
     $printer->{SPOOLER} = 'pdq'  and printer::main::read_configured_queues($printer);
--r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf');
+modules::mergein_conf();
 
 undef $w;
 
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index de5eede6a..1cd03cc43 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -20,7 +20,7 @@ my $last_boot_config = $hw_sysconfdir."/previous_hw";
 
 $last_boot_config .= '_X11' if $invert_do_it;
 
-modules::mergein_conf('/etc/modules.conf');
+modules::mergein_conf();
 
 # autoreconfigure the mouse on major kernel change:
 my $prev_kernel = { getVarsFromSh("$hw_sysconfdir/kernel") }->{KERNEL};
-- 
cgit v1.2.1