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