summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-20 08:33:11 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-20 08:33:11 +0000
commitffbb4adc77d945d66ad3cf896b998908f800b195 (patch)
tree3e47bf316b93e7f484309b050d68ec3363b97634
parent7e4f566a3e5f1fb42593a8ac0bdd8bafb9dcb6ad (diff)
downloaddrakx-ffbb4adc77d945d66ad3cf896b998908f800b195.tar
drakx-ffbb4adc77d945d66ad3cf896b998908f800b195.tar.gz
drakx-ffbb4adc77d945d66ad3cf896b998908f800b195.tar.bz2
drakx-ffbb4adc77d945d66ad3cf896b998908f800b195.tar.xz
drakx-ffbb4adc77d945d66ad3cf896b998908f800b195.zip
fix wiping out /etc/modules.conf (scott@littlefish.ca)
-rwxr-xr-xperl-install/standalone/drakxtv4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 407344b61..1c62b20be 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -116,12 +116,14 @@ my @devices = grep { $_->{media_type} eq 'MULTIMEDIA_VIDEO' || $_->{driver} eq '
push @devices, { driver => 'bttv', description => 'dummy' } if $::testing && !@devices;
if (@devices) {
my $not_canceled = 1;
+ my $configured;
# TODO: That need some work for multiples TV cards
foreach (@devices) {
if ($< == 0 && (grep { detect_devices::isTVcard($_) } @devices)) {
require harddrake::v4l;
require modules;
- modules::read_conf();
+ modules::mergein_conf('/etc/modules.conf') if !$configured;
+ $configured++;
$not_canceled &&= harddrake::v4l::config($in, $_->{driver});
modules::write_conf();
}