summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-02-07 18:28:18 +0000
committerOlivier Blin <oblin@mandriva.org>2005-02-07 18:28:18 +0000
commit696e9b68e2409cf5b973df46e14801c8bf70730d (patch)
tree59dc5aee69768c34b8911a33d1da0515c55d6427
parentd91bdd409c109e651063a007957a3e51161fc01a (diff)
downloaddrakx-696e9b68e2409cf5b973df46e14801c8bf70730d.tar
drakx-696e9b68e2409cf5b973df46e14801c8bf70730d.tar.gz
drakx-696e9b68e2409cf5b973df46e14801c8bf70730d.tar.bz2
drakx-696e9b68e2409cf5b973df46e14801c8bf70730d.tar.xz
drakx-696e9b68e2409cf5b973df46e14801c8bf70730d.zip
select manual adsl connection type if the network interface was static
-rw-r--r--perl-install/network/netconnect.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index fdd628b16..d0041c704 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -830,6 +830,8 @@ and copy the mgmt.o in /usr/share/speedtouch", 'http://prdownloads.sourceforge.n
if (!exists $adsl_devices{$ntf_name}) {
$ethntf = $intf->{$ntf_name} ||= { DEVICE => $ntf_name };
$adsl_type ||= $ethntf->{BOOTPROTO} || "dhcp";
+ #- FIXME: use static instead of manual as key in %adsl_devices
+ $adsl_type = "manual" if $adsl_type eq "static";
#- pppoa shouldn't be selected by default for ethernet devices, fallback on pppoe
$adsl_type = "pppoe" if $adsl_type eq "pppoa";
}