From 8fc41a1333f01496878ca0561f3ca1ad186b6d64 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 3 Jun 2005 07:14:48 +0000
Subject: - merge network settings in a $net hash (it modifies $o fields too): 
  o $netc becomes $net->{network} and $net->{resolv}   o $intf becomes
 $net->{ifcfg} - move zeroconf config stuff in write_zeroconf -
 read_tmdns_conf -> read_zeroconf - read_all_conf -> read_net_conf -
 configureNetwork2 -> configure_network - configure_network: write ifcfg files
 for ppp interfaces too - don't install wireless-tools in configure_network,
 this package is in basesystem - most functions don't need the file path as an
 argument in network::network - drop network::tools::remove_initscript - don't
 export too much from network::network - don't export from network::tools -
 remove adsl_unsupported_eci step in drakconnect - drop passwd2 field in
 network::adsl - drop $net->{isdn_internal} - network::netconnect : main ->
 safe_main - use network::netconnect::real_main during install - don't read
 network config in network::netconnect::real_main - install_steps::upNetwork :
 resolv.conf is already symlinked by network::network::configure_network when
 appropriate - try to fix install_any::generate_automatic_stage1_params to use
 a real interface configuration - put authentication stuff in $net->{auth} -
 drop network::ethernet::write_ether_conf - drop network::adsl::get_wizard -
 use 'static' instead of 'manual' as ADSL method - drop first_modem and its
 workarounds in network::modem - drop deprecated "multiple_internet_cnx" step
 in drakconnect - don't save /etc/sysconfig/drakconnect anymore - drop
 MDK::Common::Globals stuff - drop getIP in net_applet (Pixel) - drop
 $netc->{DHCP} - configure_network(): write resolv.conf even if a dhcp
 interface is configured

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

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

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 63f2df1a1..8f5c0ff44 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -785,10 +785,10 @@ sub configureNetwork {
 
     if ($o->{meta_class} eq 'firewall') {
 	require network::netconnect;
-	network::netconnect::main($o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
+	network::netconnect::real_main($o->{net}, $o, $o->{modules_conf});
     } else {
 	require network::network;
-	network::network::easy_dhcp($o->{modules_conf}, $o->{netc}, $o->{intf}) and $o->{netcnx}{type} = 'lan';
+	network::network::easy_dhcp($o->{net}, $o->{modules_conf});
 	$o->SUPER::configureNetwork;
     }
 }
@@ -914,7 +914,7 @@ sub summaryBefore {
     #- get back network configuration.
     require network::network;
     eval {
-	network::network::read_all_conf($o->{prefix}, $o->{netc} ||= {}, $o->{intf} ||= {}, $o->{netcnx} ||= {});
+	network::network::read_net_conf($o->{net});
     };
     log::l("summaryBefore: network configuration: ", formatError($@)) if $@;
 }
@@ -1061,14 +1061,11 @@ sub summary {
     push @l, {
 	group => N("Network & Internet"),
 	label => N("Network"),
-	val => sub { $o->{netcnx}{type} },
+	val => sub { $o->{net}{type} },
 	clicked => sub { 
 	    local $::expert = $::expert;
 	    require network::netconnect;
-	    network::netconnect::main($o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
-	    #- in case netcnx type is not updated.
-	    require network::network;
-	    network::network::probe_netcnx_type($o->{prefix}, $o->{netc}, $o->{intf}, $o->{netcnx});
+	    network::netconnect::real_main($o->{net}, $o, $o->{modules_conf});
 	},
     };
 
@@ -1194,7 +1191,7 @@ sub setRootPassword {
 
     if ($o->{security} >= 1 || $clicked) {
 	require authentication;
-	authentication::ask_root_password_and_authentication($o, $o->{netc}, $sup, $o->{authentication} ||= {}, $o->{meta_class}, $o->{security});
+	authentication::ask_root_password_and_authentication($o, $o->{net}, $sup, $o->{authentication} ||= {}, $o->{meta_class}, $o->{security});
     }
     install_steps::setRootPassword($o);
 }
-- 
cgit v1.2.1