summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/service_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/standalone/service_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/standalone/service_harddrake')
-rwxr-xr-xperl-install/standalone/service_harddrake2
1 files changed, 1 insertions, 1 deletions
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};