From ddfb9fb0af4ff35ba3b7cc2f392f46bfe42a45e7 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 13 Sep 2004 13:21:01 +0000 Subject: do not auto-select static/dhcp if the provider uses pppoe --- perl-install/network/netconnect.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl-install/network/netconnect.pm') 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"; } -- cgit v1.2.1