summaryrefslogtreecommitdiffstats
path: root/perl-install/harddrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-07 07:21:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-07 07:21:04 +0000
commit89e2c0f66b7aac23562cac0c22a3b71f388fe568 (patch)
tree30cddc6802f479466a92af9e5b89a77c8139095f /perl-install/harddrake
parentdd69bb2017f7dad5911f7117b7863f20baae83b1 (diff)
downloaddrakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar
drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.gz
drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.bz2
drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.xz
drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.zip
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
Diffstat (limited to 'perl-install/harddrake')
-rw-r--r--perl-install/harddrake/data.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 3f4d071bc..ca1b30b40 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -260,7 +260,7 @@ our @tree =
detector => sub {
require mouse;
require modules;
- modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf';
+ modules::mergein_conf();
&mouse::detect();
},
checked_on_boot => 1,