summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-12-02 14:23:03 +0000
committerOlivier Blin <oblin@mandriva.org>2005-12-02 14:23:03 +0000
commitce655000bdd2bb37c0213c97adae657a71c8d856 (patch)
tree39ca4dcf4bc7fd771cf89545bec37eca30ec975f
parent26644130f736ec3fb9f0579429e1040d5cd8dc15 (diff)
downloaddrakx-ce655000bdd2bb37c0213c97adae657a71c8d856.tar
drakx-ce655000bdd2bb37c0213c97adae657a71c8d856.tar.gz
drakx-ce655000bdd2bb37c0213c97adae657a71c8d856.tar.bz2
drakx-ce655000bdd2bb37c0213c97adae657a71c8d856.tar.xz
drakx-ce655000bdd2bb37c0213c97adae657a71c8d856.zip
load all ethernet modules in all installation modes (fixes the problem of firewire not being loaded in automatic mode)
-rw-r--r--perl-install/install2.pm3
-rw-r--r--perl-install/install_steps_auto_install.pm7
-rw-r--r--perl-install/install_steps_interactive.pm3
3 files changed, 2 insertions, 11 deletions
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});