diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-12-08 12:42:33 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-12-08 12:42:33 +0000 |
| commit | d1ae5335b04dd30597045cb758c1519bbe1cff6c (patch) | |
| tree | ea602bcd38996651c55b8daa232deb1710705079 /perl-install/network/netconnect.pm | |
| parent | 08a020e7dbce9d024b77336df053af9bff1cece4 (diff) | |
| download | drakx-backup-do-not-use-d1ae5335b04dd30597045cb758c1519bbe1cff6c.tar drakx-backup-do-not-use-d1ae5335b04dd30597045cb758c1519bbe1cff6c.tar.gz drakx-backup-do-not-use-d1ae5335b04dd30597045cb758c1519bbe1cff6c.tar.bz2 drakx-backup-do-not-use-d1ae5335b04dd30597045cb758c1519bbe1cff6c.tar.xz drakx-backup-do-not-use-d1ae5335b04dd30597045cb758c1519bbe1cff6c.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 f48872887..3b0fa1153 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -889,9 +889,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 { |