From a37a08955766ea2a2e26e9ec3e14b922fc4b2fb5 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 23 Feb 2004 08:25:20 +0000
Subject: read ppp config earlier and prevent provider choice to overwrite it
 (but if user select a *new* provider)

---
 perl-install/network/netconnect.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index af8151148..9fd5e28dc 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -408,6 +408,8 @@ Take a look at http://www.linmodems.org"),
                    ppp_provider =>
                    {
                     pre => sub {
+                        network::modem::ppp_read_conf($netcnx, $netc) if !$modem_conf_read;
+                        $modem_conf_read = 1;
                         @isp = map {
                             my $country = $_;
                             map { 
@@ -427,7 +429,7 @@ Take a look at http://www.linmodems.org"),
                         ($country, $provider) = split('/', $provider);
                         $country = { reverse %countries }->{$country};
                         my %l = getVarsFromSh("$db_path/$country/$provider");
-                        if ($old_provider ne $provider) {
+                        if (defined $old_provider && $old_provider ne $provider) {
                             $modem->{connection} = $l{Name};
                             $modem->{phone} = $l{Phonenumber};
                             $modem->{$_} = $l{$_} foreach qw(Authentication AutoName Domain Gateway IPAddr SubnetMask);
@@ -447,8 +449,6 @@ Take a look at http://www.linmodems.org"),
                                          q(ifdown ppp0
 killall pppd
 ), $netcnx->{type});
-                        network::modem::ppp_read_conf($netcnx, $netc) if !$modem_conf_read;
-                        $modem_conf_read = 1;
                     },
                     name => N("Dialup: account options"), 
                     data => sub {
-- 
cgit v1.2.1