summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-16 06:54:30 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-16 06:54:30 +0000
commit4e2d865fc75a18252c57a8b3f70075efb0af19bf (patch)
tree050e657a3c6ff4b3abad9fa5e25d6dc43a7539cf
parentb4151ab3f63b375f82f69cd43da50f0ce06eca91 (diff)
downloaddrakx-4e2d865fc75a18252c57a8b3f70075efb0af19bf.tar
drakx-4e2d865fc75a18252c57a8b3f70075efb0af19bf.tar.gz
drakx-4e2d865fc75a18252c57a8b3f70075efb0af19bf.tar.bz2
drakx-4e2d865fc75a18252c57a8b3f70075efb0af19bf.tar.xz
drakx-4e2d865fc75a18252c57a8b3f70075efb0af19bf.zip
(read_all_conf) use network::tools to probe connection type
-rw-r--r--perl-install/network/network.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index a578e32f0..c3faf7ae9 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -347,7 +347,9 @@ sub read_all_conf {
$intf->{WIRELESS_ENC_KEY} = network::tools::get_wep_key_from_iwconfig($intf->{WIRELESS_ENC_KEY});
}
}
- $netcnx->{type} or probe_netcnx_type($::prefix, $netc, $intf, $netcnx);
+ if (my $default_intf = network::tools::get_default_gateway_interface($netc, $intf)) {
+ $netcnx->{type} ||= network::tools::get_interface_type($intf->{$default_intf});
+ }
}
#- FIXME: this is buggy, use network::tools::get_default_gateway_interface