- %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, 4 insertions, 4 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index e768c1b06..5fd0b8c6f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -475,7 +475,7 @@ sub setDefaultPackages {
     push @{$o->{default_packages}}, "numlock" if $o->{miscellaneous}{numlock};
     push @{$o->{default_packages}}, "raidtools" if !is_empty_array_ref($o->{all_hds}{raids});
     push @{$o->{default_packages}}, "lvm2" if !is_empty_array_ref($o->{all_hds}{lvms});
-    push @{$o->{default_packages}}, "alsa", "alsa-utils" if any { modules::get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4;
+    push @{$o->{default_packages}}, "alsa", "alsa-utils" if any { $o->{modules_conf}->get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4;
     push @{$o->{default_packages}}, "grub" if isLoopback(fsedit::get_root($o->{fstab}));
     push @{$o->{default_packages}}, uniq(grep { $_ } map { fsedit::package_needed_for_partition_type($_) } @{$o->{fstab}});
 
@@ -503,7 +503,7 @@ sub setDefaultPackages {
     $o->{compssUsersChoice}{UTF8} = $o->{locale}{utf8};
     $o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners();
     $o->{compssUsersChoice}{DVD} = 1 if detect_devices::dvdroms();
-    $o->{compssUsersChoice}{USB} = 1 if modules::get_probeall("usb-interface");
+    $o->{compssUsersChoice}{USB} = 1 if $o->{modules_conf}->get_probeall("usb-interface");
     $o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA();
     $o->{compssUsersChoice}{HIGH_SECURITY} = 1 if $o->{security} > 3;
     $o->{compssUsersChoice}{BIGMEM} = 1 if !$::oem && availableRamMB() > 800 && arch() !~ /ia64|x86_64/;
@@ -1265,7 +1265,7 @@ sub remove_bigseldom_used() {
 #- pcmcia various
 #-###############################################################################
 sub configure_pcmcia {
-    my ($pcic) = @_;
+    my ($modules_conf, $pcic) = @_;
 
     #- try to setup pcmcia if cardmgr is not running.
     my $running if 0;
@@ -1283,7 +1283,7 @@ sub configure_pcmcia {
     sleep(3);
     
     #- make sure to be aware of loaded module by cardmgr.
-    modules::read_already_loaded();
+    modules::read_already_loaded($modules_conf);
 }
 
 sub write_pcmcia {