From d226ea747484f19145226ab324eb3c665dd368b8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 2 Feb 2004 16:11:04 +0000
Subject: fix preselecting ppoa for speedtouch modem

---
 perl-install/network/netconnect.pm | 4 ++--
 1 file 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';
                     },
                    },
-- 
cgit v1.2.1