summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-02 16:11:04 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-02 16:11:04 +0000
commitd226ea747484f19145226ab324eb3c665dd368b8 (patch)
tree8c00d5f06bb5a30e2e47d9d245fc681f921abf8f
parent69e360c2208216392a8640d5a8cc6b2d4f957d0a (diff)
downloaddrakx-backup-do-not-use-d226ea747484f19145226ab324eb3c665dd368b8.tar
drakx-backup-do-not-use-d226ea747484f19145226ab324eb3c665dd368b8.tar.gz
drakx-backup-do-not-use-d226ea747484f19145226ab324eb3c665dd368b8.tar.bz2
drakx-backup-do-not-use-d226ea747484f19145226ab324eb3c665dd368b8.tar.xz
drakx-backup-do-not-use-d226ea747484f19145226ab324eb3c665dd368b8.zip
fix preselecting ppoa for speedtouch modem
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index e81b0d89c..7b327be6e 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -585,11 +585,11 @@ killall pppd
next => 'adsl_protocol',
post => sub {
$adsl_data = $adsl_data{$adsl_provider};
+ $adsl_protocol = $adsl_types{pppoa} if $ntf_name eq 'speedtouch';
if ($adsl_provider ne $adsl_old_provider) {
$netc->{$_} = $adsl_data->{$_} foreach qw(dnsServer2 dnsServer3 DOMAINNAME2 Encapsulation vpi vci);
- $adsl_protocol = $adsl_types{$adsl_data->{method}};
+ $adsl_protocol ||= $adsl_types{$adsl_data->{method}};
}
- $adsl_protocol = $adsl_types{pppoa} if $ntf_name eq 'speedtouch';
return 'adsl_protocol';
},
},