diff options
| -rw-r--r-- | perl-install/network/netconnect.pm | 24 | ||||
| -rw-r--r-- | perl-install/network/tools.pm | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/drakconnect | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/net_monitor | 3 |
4 files changed, 15 insertions, 17 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 15a5a7a8b..2fb9fbdfa 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -261,7 +261,8 @@ sub real_main { data => \@connection_list, post => sub { $is_wireless = $cnx_type eq N("Wireless connection"); - load_conf($netcnx, $netc, $intf) if $::isInstall; # :-( + #- why read again the net_conf here ? + read_net_conf($netcnx, $netc, $intf) if $::isInstall; # :-( $type = $netcnx->{type} = $connections{$cnx_type}; if ($type eq 'cable') { $auto_ip = 1; @@ -1373,14 +1374,6 @@ sub get_profiles() { map { if_(m!([^/]*)/$!, $1) } glob("$::prefix/etc/netprofile/profiles/*/"); } -sub load_conf { - my ($netcnx, $netc, $intf) = @_; - my $current = { getVarsFromSh("$::prefix/etc/netprofile/current") }; - - $netcnx->{PROFILE} = $current->{PROFILE} || 'default'; - network::network::read_all_conf($::prefix, $netc, $intf, $netcnx); -} - sub get_net_device() { my $connect_file = $network::tools::connect_file; my $network_file = "$::prefix/etc/sysconfig/network"; @@ -1396,9 +1389,16 @@ sub get_net_device() { } sub read_net_conf { - my (undef, $netcnx, $netc) = @_; - $netc->{$_} = $netcnx->{$_} foreach 'NET_DEVICE', 'NET_INTERFACE'; - $netcnx->{$netcnx->{type}} ||= {}; + my ($netcnx, $netc, $intf) = @_; + my $current = { getVarsFromSh("$::prefix/etc/netprofile/current") }; + + $netcnx->{PROFILE} = $current->{PROFILE} || 'default'; + network::network::read_all_conf($::prefix, $netc, $intf, $netcnx); + + foreach ('NET_DEVICE', 'NET_INTERFACE') { + $netc->{$_} = $netcnx->{$_} if $netcnx->{$_} + } + $netcnx->{$netcnx->{type}} ||= {} if $netcnx->{type}; } sub start_internet { diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index aae98c90d..3e2dbaee7 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -191,9 +191,8 @@ sub is_dynamic_host { sub reread_net_conf { my ($netcnx, $netc, $intf) = @_; - network::netconnect::read_net_conf('', $netcnx, $netc); + network::netconnect::read_net_conf($netcnx, $netc, $intf); modules::load_category('net'); - network::netconnect::load_conf($netcnx, $netc, $intf); } sub convert_wep_key_for_iwconfig { diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index 5922ca50e..cfe9647c7 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -633,7 +633,7 @@ sub check_field { sub add_intf() { $::isWizard = 1; - network::netconnect::load_conf($netcnx, $netc, $intf); + network::netconnect::read_net_conf($netcnx, $netc, $intf); # network::netconnect::add_interface($in, $netcnx); network::netconnect::main('', $netcnx, $in, $netc, undef, $intf); $in->exit(0); diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index 7c6827aaa..8116be919 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -82,8 +82,7 @@ my $arrow_size = 5; my $use_same_scale = 1; -network::netconnect::load_conf($netcnx, $netc, $intf); -network::netconnect::read_net_conf('', $netcnx, $netc); +network::netconnect::read_net_conf($netcnx, $netc, $intf); MDK::Common::Globals::init(in => $in); gtkadd($window1->{window}, |