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/install_steps.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 01fd2f333..625e1d941 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -153,10 +153,10 @@ sub acceptLicense {}
 #------------------------------------------------------------------------------
 sub setupSCSI {
     my ($o) = @_;
-    install_any::configure_pcmcia($o->{pcmcia}) if $o->{pcmcia};
+    install_any::configure_pcmcia($o->{modules_conf}, $o->{pcmcia}) if $o->{pcmcia};
     modules::load(modules::category2modules('disk/cdrom'));
-    modules::load_category('bus/firewire');
-    modules::load_category('disk/scsi|hardware_raid|firewire');
+    modules::load_category($o->{modules_conf}, 'bus/firewire');
+    modules::load_category($o->{modules_conf}, 'disk/scsi|hardware_raid|firewire');
 
     install_any::getHds($o);
 }
@@ -955,7 +955,7 @@ sub upNetwork {
 	symlinkf("$o->{prefix}/etc/$_", "/etc/$_") foreach qw(resolv.conf protocols services);
     }
     member($o->{method}, qw(ftp http nfs)) and return 1;
-    modules::write_conf();
+    $o->{modules_conf}->write;
     if (hasNetwork($o)) {
 	if ($o->{netcnx}{type} =~ /adsl|lan|cable/) {
 	    log::l("starting network ($o->{netcnx}{type})");
@@ -981,7 +981,7 @@ sub downNetwork {
     my ($o, $costlyOnly) = @_;
 
     $o->{method} eq "ftp" || $o->{method} eq "http" || $o->{method} eq "nfs" and return 1;
-    modules::write_conf();
+    $o->{modules_conf}->write;
     if (hasNetwork($o)) {
 	if (!$costlyOnly) {
 	    require network::netconnect;
-- 
cgit v1.2.1