- 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

1 files changed, 7 insertions, 5 deletions

diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 653ddf24a..ac904f8ff 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -6,13 +6,15 @@ use common;
 use interactive;
 use any;
 use authentication;
+use network::network;
 use network::netconnect;
 use security::level;
 
 $ENV{SHARE_PATH} ||= "/usr/share";
 my $authentication = authentication::get();
 my $security = security::level::get();
-network::netconnect::read_net_conf(my $netcnx = {}, my $netc = {}, my $intf = {});
+my $net = {};
+network::network::read_net_conf($net);
 
 $::isWizard = 1;
 my $in = 'interactive'->vnew;
@@ -29,19 +31,19 @@ sub ask_language() {
 sub ask_network() {
     my $modules_conf = modules::any_conf->read;
     require network::netconnect;
-    network::netconnect::real_main($netcnx, $in, $modules_conf, $netc, undef, $intf);
+    network::netconnect::real_main($net, $in, $modules_conf);
 }
 
 sub ask_authentication() {
     my $meta_class = { getVarsFromSh("/etc/sysconfig/system") }->{META_CLASS};
 
     my $superuser = {};
-    authentication::ask_root_password_and_authentication($in, $netc, $superuser, $authentication, $meta_class, $security);
+    authentication::ask_root_password_and_authentication($in, $net, $superuser, $authentication, $meta_class, $security);
     authentication::set_root_passwd($superuser, $authentication);
 
     eval { 
-	authentication::set($in, $netc, $authentication);
-	network::network::write_conf($netc);
+	authentication::set($in, $net, $authentication);
+	network::network::write_network_conf($net);
     };
     if (my $err = $@) {
 	$in->ask_warn(N("Error"), formatError($err));