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

diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound
index 9737c3d48..4807bf686 100755
--- a/perl-install/standalone/draksound
+++ b/perl-install/standalone/draksound
@@ -29,18 +29,19 @@ use detect_devices;
 
 my $in = 'interactive'->vnew('su');
 
-modules::mergein_conf();
+
+my $modules_conf = modules::any_conf->read;
 
 if (my @devices = modules::probe_category('multimedia/sound')) {
     # TODO: That need some work for multiples sound cards
     map_index {
 	   # allocate sound-slot in the same order as install2.pm
 	   # fill $device->{driver} with the right sound-slot-XX or default driver if missing sound-slot [real fix'll be in harddrake service]
-	   my $driver = modules::get_alias("sound-slot-$::i");
-	   $driver = modules::get_alias($driver) if $driver =~ /sound-card/; # alsaconf ...
+	   my $driver = $modules_conf->get_alias("sound-slot-$::i");
+	   $driver = $modules_conf->get_alias($driver) if $driver =~ /sound-card/; # alsaconf ...
 	   $_->{current_driver} = $driver if $driver;
 	   $_->{sound_slot_index} = $::i;
-	   harddrake::sound::config($in, $_, $::i);
+	   harddrake::sound::config($in, $modules_conf, $_, $::i);
 	 } @devices;
 } else {
     $in->ask_warn(N("No Sound Card detected!"), 
@@ -54,5 +55,5 @@ http://www.linux-mandrake.com/en/hardware.php3") .
 N("\n\n\nNote: if you've an ISA PnP sound card, you'll have to use the alsaconf or the sndconfig program.  Just type \"alsaconf\" or \"sndconfig\" in a console.")));
 }
 
-modules::write_conf();
+$modules_conf->write;
 $in->exit(0);