- %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/network/adsl.pm b/perl-install/network/adsl.pm
index 2089dd229..f2b50186b 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -96,7 +96,7 @@ sub adsl_detect() {
 }
 
 sub adsl_conf_backend {
-    my ($in, $adsl, $netc, $adsl_device, $adsl_type, $o_netcnx) = @_;
+    my ($in, $modules_conf, $adsl, $netc, $adsl_device, $adsl_type, $o_netcnx) = @_;
     # FIXME: should not be needed:
     defined $o_netcnx and $netc->{adsltype} = $o_netcnx->{type};
     $netc->{adsltype} ||= "adsl_$adsl_type";
@@ -307,8 +307,8 @@ TYPE=$kind
     
     # set aliases:
     if (exists $modems{$adsl_device}{aliases}) {
-        modules::set_alias($_->[0], $_->[1]) foreach @{$modems{$adsl_device}{aliases}};
-        $::isStandalone and modules::write_conf();
+        $modules_conf->set_alias($_->[0], $_->[1]) foreach @{$modems{$adsl_device}{aliases}};
+        $::isStandalone and $modules_conf->write;
     }
 
     $netc->{NET_INTERFACE} = 'ppp0';