diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-12 15:05:16 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-12 15:05:16 +0000 |
| commit | 9ff2effc16b64bd7a6073e1d4cc3776bb009de61 (patch) | |
| tree | 102f4442a4d37a0fff96c478e27b4c90c850a5eb | |
| parent | bdd9640e07024fc400b7127053f1753aff7677b1 (diff) | |
| download | drakx-9ff2effc16b64bd7a6073e1d4cc3776bb009de61.tar drakx-9ff2effc16b64bd7a6073e1d4cc3776bb009de61.tar.gz drakx-9ff2effc16b64bd7a6073e1d4cc3776bb009de61.tar.bz2 drakx-9ff2effc16b64bd7a6073e1d4cc3776bb009de61.tar.xz drakx-9ff2effc16b64bd7a6073e1d4cc3776bb009de61.zip | |
preselect right protocol for ethernet though connections
| -rw-r--r-- | perl-install/network/netconnect.pm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 8c7ae8e1f..fb35a37c1 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -669,6 +669,13 @@ and copy the mgmt.o in /usr/share/speedtouch", 'http://prdownloads.sourceforge.n adsl_protocol => { + pre => sub { + # preselect right protocol for ethernet though connections: + if (!exists $adsl_devices{$ntf_name}) { + $ethntf = $intf->{$ntf_name} ||= { DEVICE => $ntf_name }; + $adsl_type = $ethntf->{BOOTPROTO} || "dhcp"; + } + }, name => N("Connect to the Internet") . "\n\n" . N("The most common way to connect with adsl is pppoe. Some connections use pptp, a few use dhcp. @@ -684,7 +691,6 @@ If you don't know, choose 'use pppoe'"), # process static/dhcp ethernet devices: if (!exists $adsl_devices{$ntf_name} && member($adsl_type, qw(manual dhcp))) { $auto_ip = $adsl_type eq 'dhcp'; - $ethntf = $intf->{$ntf_name} ||= { DEVICE => $ntf_name }; $find_lan_module->(); return 'lan_intf'; } |