diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 07:21:04 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 07:21:04 +0000 |
| commit | 89e2c0f66b7aac23562cac0c22a3b71f388fe568 (patch) | |
| tree | 30cddc6802f479466a92af9e5b89a77c8139095f /perl-install/standalone/drakxtv | |
| parent | dd69bb2017f7dad5911f7117b7863f20baae83b1 (diff) | |
| download | drakx-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/drakxtv')
| -rwxr-xr-x | perl-install/standalone/drakxtv | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |