diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-25 21:57:09 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-25 21:57:09 +0000 |
| commit | cc05c5036ed820e139eee22d03913148b9e164da (patch) | |
| tree | 97006f41e82bb2cfcf9e4b6304f5d9f0c5c0ca26 | |
| parent | e7a29622a732352b143b175a973f57fbbdcda139 (diff) | |
| download | drakx-cc05c5036ed820e139eee22d03913148b9e164da.tar drakx-cc05c5036ed820e139eee22d03913148b9e164da.tar.gz drakx-cc05c5036ed820e139eee22d03913148b9e164da.tar.bz2 drakx-cc05c5036ed820e139eee22d03913148b9e164da.tar.xz drakx-cc05c5036ed820e139eee22d03913148b9e164da.zip | |
set adsl protocol to use according to provider database when using a sagem 800
modem
| -rw-r--r-- | perl-install/network/netconnect.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 2906cb93a..a85a5c231 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -89,7 +89,7 @@ sub get_subwizard { my ($network_configured, $direct_net_install, $cnx_type, $type, $interface, @cards, @all_cards, @devices); my (%connections, %rconnections, @connection_list); my ($modem, $modem_name, $modem_conf_read, $modem_dyn_dns, $modem_dyn_ip); - my ($adsl_type, $adsl_protocol, $adsl_device, @adsl_devices, $adsl_failed, $adsl_answer, %adsl_data, $adsl_data, $adsl_provider); + my ($adsl_type, $adsl_protocol, $adsl_device, @adsl_devices, $adsl_failed, $adsl_answer, %adsl_data, $adsl_data, $adsl_provider, $adsl_old_provider); my ($ntf_name, $ipadr, $netadr, $gateway_ex, $up, $isdn, $isdn_type, $need_restart_network); my ($module, $auto_ip, $onboot, $needhostname, $hotplug, $track_network_id, @fields); # lan config my $success = 1; @@ -560,6 +560,7 @@ killall pppd pre => sub { require network::adsl_consts; %adsl_data = %network::adsl_consts::adsl_data; + $adsl_old_provider = $adsl_provider; }, name => N("Please choose your ADSL provider"), data => sub { @@ -568,7 +569,7 @@ killall pppd next => 'adsl_protocol', post => sub { $adsl_data = $adsl_data{$adsl_provider}; - $adsl_protocol = $adsl_data->{method} if $adsl_data->{method}; + $adsl_protocol = $adsl_types{$adsl_data->{method}} if $adsl_provider ne $adsl_old_provider && !defined $adsl_protocol && $adsl_data->{method}; return 'adsl_protocol'; }, }, |