From 7e8fa9773839843c9d8def81ec2ef1315115825a Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 21 Jul 2004 00:16:04 +0000 Subject: - %modules::conf is no more a global, so many functions need passing $modules_conf - $modules_conf is a class choosing modules.conf or modprobe.conf (esp. useful after install) (but not working yet!) - modules::load() doesn't use $modules_conf, use modules::load_and_configure() - modules::load() doesn't allow options, use either modules::load_raw() or modules::load_and_configure() - some functions used to want an array ref for modules options and some a string, now every functions use a string - many functions (like modules::get_alias()) are now methods on $modules_conf - some functions in mouse.pm needed a $in where a $do_pkgs is enough - some perl_checker compliance - small fixes --- perl-install/standalone/drakxtv | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'perl-install/standalone/drakxtv') diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index 6646a3f37..40e78fb09 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -115,16 +115,16 @@ my @devices = detect_devices::getTVcards(); push @devices, { driver => 'bttv', description => 'dummy' } if $::testing && !@devices; if (@devices) { my $not_canceled = 1; - my $configured; + my $modules_conf; # TODO: That need some work for multiples TV cards each_index { if (($< == 0 || $::testing) && (grep { detect_devices::isTVcard($_) } @devices)) { require harddrake::v4l; require modules; - modules::mergein_conf() if !$configured; - $configured++; - $not_canceled &&= harddrake::v4l::config($in, $_->{driver}); - modules::write_conf(); + + $modules_conf ||= modules::any_conf->read; + $not_canceled &&= harddrake::v4l::config($in, $modules_conf, $_->{driver}); + $modules_conf->write; } scan4channels() if $not_canceled; } @devices -- cgit v1.2.1