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

3 files changed, 6 insertions, 5 deletions

diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index 71adef0cf..c1f4f3aaa 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -7,7 +7,7 @@ use detect_devices;
 use printer::data;
 
 sub local_detect() {
-    modules::get_probeall("usb-interface") and eval { modules::load($usbprintermodule) };
+    modules::any_conf->read->get_probeall("usb-interface") and eval { modules::load($usbprintermodule) };
     eval { modules::unload(qw(lp parport_pc parport)) }; #- on kernel 2.4 parport has to be unloaded to probe again
     eval { modules::load(qw(parport_pc lp)) }; #- take care as not available on 2.4 kernel (silent error).
     whatPrinter();
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index fdfbdf317..9b641f79a 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -2277,7 +2277,7 @@ sub configure_hpoj {
 		    my $usbdev = usbdevice($_->{val});
 		    if (defined($usbdev)) {
 			# Unload kernel module "printer"/"usblp"
-			if (modules::get_probeall("usb-interface")) {
+			if (modules::any_conf->read->get_probeall("usb-interface")) {
 			    eval(modules::unload($usbprintermodule));
 			    $printermoduleunloaded = 1;
 			}
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 0eb075250..16ce47230 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -3513,11 +3513,12 @@ sub check_network {
 					    N("Go on without configuring the network") ] } ])) {
 		if ($choice eq N("Configure the network now")) {
 		    if ($::isInstall) {
+			my $o = $in;
 			require network::netconnect;
 		        network::netconnect::main(
-			     $in->{prefix}, $in->{netcnx} ||= {}, 
-			     $in, $in->{netc}, $in->{mouse}, 
-			     $in->{intf});
+			     $o->{prefix}, $o->{netcnx} ||= {}, 
+			     $in, $o->{modules_conf}, $o->{netc}, $o->{mouse}, 
+			     $o->{intf});
 #    my ($prefix, $netcnx, $in, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) = @_;
 		    } else {
 			system("/usr/sbin/drakconnect");