From 7e8fa9773839843c9d8def81ec2ef1315115825a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 21 Jul 2004 00:16:04 +0000
Subject: - %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

---
 perl-install/detect_devices.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'perl-install/detect_devices.pm')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 5e573574d..58731e0a3 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -412,7 +412,7 @@ sub getCPUs() {
 }
 
 sub getSoundDevices() {
-    (arch() =~ /ppc/ ? \&modules::load_category : \&modules::probe_category)->('multimedia/sound');
+    modules::probe_category('multimedia/sound');
 }
 
 sub isTVcard { member($_[0]{driver}, qw(bttv cx8800 saa7134 usbvision)) }
@@ -422,7 +422,7 @@ sub getTVcards() {
 }
 
 sub getSerialModem {
-    my ($o_mouse) = @_;
+    my ($modules_conf, $o_mouse) = @_;
     my $mouse = $o_mouse || {};
     $mouse->{device} = readlink "/dev/mouse";
     my $serdev = arch() =~ /ppc/ ? "macserial" : "serial";
@@ -441,14 +441,15 @@ sub getSerialModem {
     my @devs = pcmcia_probe();
     foreach my $modem (@modems) {
         #- add an alias for macserial on PPC
-        modules::set_alias('serial', $serdev) if arch() =~ /ppc/ && $modem->{device};
+        $modules_conf->set_alias('serial', $serdev) if arch() =~ /ppc/ && $modem->{device};
         foreach (@devs) { $_->{type} =~ /serial/ and $modem->{device} = $_->{device} }
     }
     @modems;
 }
 
-sub getModem() {
-    getSerialModem({}), matching_driver('www\.linmodems\.org');
+sub getModem {
+    my ($modules_conf) = @_;
+    getSerialModem($modules_conf, {}), matching_driver('www\.linmodems\.org');
 }
 
 sub getSpeedtouch() {
-- 
cgit v1.2.1