From ffbb4adc77d945d66ad3cf896b998908f800b195 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Sat, 20 Mar 2004 08:33:11 +0000
Subject: fix wiping out /etc/modules.conf (scott@littlefish.ca)

---
 perl-install/standalone/drakxtv | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/standalone/drakxtv')

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();
 	   }
-- 
cgit v1.2.1