From 89e2c0f66b7aac23562cac0c22a3b71f388fe568 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux 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/drakxtv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl-install/standalone/drakxtv') 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(); -- cgit v1.2.1