From 352328234b9c3dcda45b99edb65abb93a4895c76 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 5 Oct 2004 06:47:23 +0000
Subject: for meta_class firewall, call the general netconnect function

---
 perl-install/install_steps_interactive.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'perl-install')

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;
+    }
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1