summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-10-05 06:47:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-10-05 06:47:23 +0000
commit352328234b9c3dcda45b99edb65abb93a4895c76 (patch)
tree0e76a66274df7752cdc668320fb783ed26065039
parentdef2682432056fc214fd7b519bda14a447b5f5d3 (diff)
downloaddrakx-352328234b9c3dcda45b99edb65abb93a4895c76.tar
drakx-352328234b9c3dcda45b99edb65abb93a4895c76.tar.gz
drakx-352328234b9c3dcda45b99edb65abb93a4895c76.tar.bz2
drakx-352328234b9c3dcda45b99edb65abb93a4895c76.tar.xz
drakx-352328234b9c3dcda45b99edb65abb93a4895c76.zip
for meta_class firewall, call the general netconnect function
-rw-r--r--perl-install/install_steps_interactive.pm12
1 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index c48b969c7..7c15be613 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -788,11 +788,17 @@ sub updateModulesFromFloppy {
#------------------------------------------------------------------------------
sub configureNetwork {
my ($o) = @_;
- require network::network;
require network::ethernet;
modules::load_category($o->{modules_conf}, network::ethernet::get_eth_categories());
- network::network::easy_dhcp($o->{modules_conf}, $o->{netc}, $o->{intf}) and $o->{netcnx}{type} = 'lan';
- $o->SUPER::configureNetwork;
+
+ if ($o->{meta_class} eq 'firewall') {
+ require network::netconnect;
+ network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
+ } else {
+ require network::network;
+ network::network::easy_dhcp($o->{modules_conf}, $o->{netc}, $o->{intf}) and $o->{netcnx}{type} = 'lan';
+ $o->SUPER::configureNetwork;
+ }
}
#------------------------------------------------------------------------------