- 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, 1 insertions, 16 deletions

diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 35e22308b..dcda7b643 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -12,31 +12,16 @@ use network::tools;
 our @dhcp_clients = qw(dhclient dhcpcd pump dhcpxd);
 
 sub install_dhcp_client {
-    my ($in, $ethntf) = @_;
+    my ($in, $client) = @_;
     my %packages = (
         "dhclient" => "dhcp-client",
     );
-    my $client = $ethntf->{DHCP_CLIENT};
     #- use default dhcp client if none is provided
     $client ||= $dhcp_clients[0];
     $client = $packages{$client} if exists $packages{$client};
     $in->do_pkgs->install($client);
 }
 
-sub write_ether_conf {
-    my ($in, $modules_conf, $netcnx, $netc, $intf) = @_;
-    configureNetwork2($in, $modules_conf, $::prefix, $netc, $intf);
-    $netc->{NETWORKING} = "yes";
-    if ($netc->{GATEWAY} || any { $_->{BOOTPROTO} =~ /dhcp/ } values %$intf) {
-	$netcnx->{type} = 'lan';
-	$netcnx->{NET_DEVICE} = $netc->{NET_DEVICE} = '';
-	$netcnx->{NET_INTERFACE} = 'lan'; #$netc->{NET_INTERFACE};
-    }
-    $::isStandalone and $modules_conf->write;
-    1;
-}
-
-
 sub mapIntfToDevice {
     my ($interface) = @_;
     my $hw_addr = c::getHwIDs($interface);