summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-13 13:21:01 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-13 13:21:01 +0000
commitddfb9fb0af4ff35ba3b7cc2f392f46bfe42a45e7 (patch)
tree07c41c61c2fb5cbd7d672685f59ab340ec53361f
parentb64b3daa14303f75a6d4c606dd155e55002e8f14 (diff)
downloaddrakx-ddfb9fb0af4ff35ba3b7cc2f392f46bfe42a45e7.tar
drakx-ddfb9fb0af4ff35ba3b7cc2f392f46bfe42a45e7.tar.gz
drakx-ddfb9fb0af4ff35ba3b7cc2f392f46bfe42a45e7.tar.bz2
drakx-ddfb9fb0af4ff35ba3b7cc2f392f46bfe42a45e7.tar.xz
drakx-ddfb9fb0af4ff35ba3b7cc2f392f46bfe42a45e7.zip
do not auto-select static/dhcp if the provider uses pppoe
-rw-r--r--perl-install/network/netconnect.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index b0c427469..6e9fe5f0a 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -768,7 +768,7 @@ and copy the mgmt.o in /usr/share/speedtouch", 'http://prdownloads.sourceforge.n
# 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";
+ $adsl_type ||= $ethntf->{BOOTPROTO} || "dhcp";
#- pppoa shouldn't be selected by default for ethernet devices, fallback on pppoe
$adsl_type = "pppoe" if $adsl_type eq "pppoa";
}