diff options
author | Olivier Blin <oblin@mandriva.org> | 2005-12-08 12:45:38 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.org> | 2005-12-08 12:45:38 +0000 |
commit | 448e1389b6a0e34cfd4752b1b65194fd05d514f1 (patch) | |
tree | e61f0353c3b90a65846a163a0111751d9dd4cd6b /perl-install/network/netconnect.pm | |
parent | fe109dc5a244ff5ec0d8625934950003bceef7f8 (diff) | |
download | drakx-backup-do-not-use-448e1389b6a0e34cfd4752b1b65194fd05d514f1.tar drakx-backup-do-not-use-448e1389b6a0e34cfd4752b1b65194fd05d514f1.tar.gz drakx-backup-do-not-use-448e1389b6a0e34cfd4752b1b65194fd05d514f1.tar.bz2 drakx-backup-do-not-use-448e1389b6a0e34cfd4752b1b65194fd05d514f1.tar.xz drakx-backup-do-not-use-448e1389b6a0e34cfd4752b1b65194fd05d514f1.zip |
fix default metric setting for wifi interfaces (thanks to Mickaƫl Le Baillif for pointing this out)
Diffstat (limited to 'perl-install/network/netconnect.pm')
-rw-r--r-- | perl-install/network/netconnect.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 214d91abe..adf6d9a9c 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -884,9 +884,8 @@ If you do not know it, keep the preselected type."), { pre => sub { $find_lan_module->(); - my $intf_type = member($module, list_modules::category2modules('network/gigabit')) ? "ethernet_gigabit" : "ethernet"; - defined($ethntf->{METRIC}) or $ethntf->{METRIC} = network::tools::get_default_metric($intf_type); - + $ethntf->{METRIC} = network::tools::get_default_metric(network::tools::get_interface_type($ethntf, $module)) + unless defined($ethntf->{METRIC}); $protocol = $l10n_lan_protocols{defined $auto_ip ? ($auto_ip ? 'dhcp' : 'static') : $ethntf->{BOOTPROTO}} || 0; }, name => sub { |