- %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

1 files changed, 3 insertions, 3 deletions

diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
index 9d4feaa14..9b331d6ee 100644
--- a/perl-install/harddrake/v4l.pm
+++ b/perl-install/harddrake/v4l.pm
@@ -279,7 +279,7 @@ my %pll_lst =
      );
 
 sub config {
-    my ($in, $driver) = @_;
+    my ($in, $modules_conf, $driver) = @_;
 
     my $min_gbuffers = 2;
     my $max_gbuffers = 32;
@@ -290,7 +290,7 @@ sub config {
     my %rvs_cards_list = reverse %cards_list;
 
     # get the existing options (if there are any)
-    my $current = modules::get_options($driver);
+    my $current = $modules_conf->get_options($driver);
 
     foreach (split(/\s+/,$current)) {
         $conf{$1} = $2 if /^(gbuffers|tuner|radio|pll)=(.+)/;
@@ -326,7 +326,7 @@ If your card is misdetected, you can force the right tuner and card types here.
         if ($options) {
             log::l(qq([harddrake::v4l] set "$options" options for $driver));
 #             log::explanations("modified file /etc/modules.conf ($options)") if $::isStandalone;
-              modules::set_options($driver, $options);
+              $modules_conf->set_options($driver, $options);
           }
         return 1;
     }