From ce655000bdd2bb37c0213c97adae657a71c8d856 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 2 Dec 2005 14:23:03 +0000
Subject: load all ethernet modules in all installation modes (fixes the
 problem of firewire not being loaded in automatic mode)

---
 perl-install/install2.pm                   | 3 ++-
 perl-install/install_steps_auto_install.pm | 7 -------
 perl-install/install_steps_interactive.pm  | 3 ---
 3 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 151bdc569..95f4b925f 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -256,10 +256,11 @@ sub configureNetwork {
     #- get current configuration of network device.
     require network::network;
     eval { network::network::read_net_conf($o->{net}) };
+    require network::ethernet;
+    modules::load_category($o->{modules_conf}, list_modules::ethernet_categories());
     if (!$o->{isUpgrade}) {
         installStepsCall($o, $auto, 'configureNetwork');
     } else {
-        require network::ethernet;
         network::ethernet::configure_eth_aliases($o->{modules_conf});
     }
 }
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index d30e9bc4a..2e35f972e 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -36,13 +36,6 @@ sub new {
     }
 }
 
-sub configureNetwork {
-    my ($o) = @_;
-    log::l("install_steps_auto_install::configureNetwork");
-    modules::load_category($o->{modules_conf}, 'network/main|gigabit|usb');
-    goto &install_steps::configureNetwork;
-}
-
 sub exitInstall {
     my ($o, $alldone) = @_;
     return if $o->{autoExitInstall};
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index dd8e5f043..c75a7f9ca 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -784,9 +784,6 @@ sub updatemodules {
 #------------------------------------------------------------------------------
 sub configureNetwork {
     my ($o) = @_;
-    require network::ethernet;
-    modules::load_category($o->{modules_conf}, list_modules::ethernet_categories());
-
     if ($o->{meta_class} eq 'firewall') {
 	require network::netconnect;
 	network::netconnect::real_main($o->{net}, $o, $o->{modules_conf});
-- 
cgit v1.2.1