- %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, 5 deletions

diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm
index 9d317fc3a..75947bf11 100644
--- a/perl-install/Xconfig/default.pm
+++ b/perl-install/Xconfig/default.pm
@@ -10,16 +10,15 @@ use mouse;
 
 
 sub configure {
-    my ($keyboard, $mouse) = @_;
+    my ($o_keyboard, $o_mouse) = @_;
 
-    $keyboard ||= keyboard::read();
-    $mouse ||= do {
+    my $keyboard = $o_keyboard || keyboard::read();
+    my $mouse = $o_mouse || do {
 	my $mouse = mouse::read(); 
-	add2hash($mouse, mouse::detect()) if !$::noauto;
+	add2hash($mouse, mouse::detect(modules::any_conf->read)) if !$::noauto;
 	$mouse;
     };
 
-
     my $raw_X = Xconfig::xfree->empty_config;
 
     $raw_X->add_load_module($_) foreach qw(dbe v4l extmod type1 freetype);