diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-23 15:19:06 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-23 15:19:06 +0000 |
| commit | e04b02c8243fd3e0769e9cb24e3ea39d9a3fc7b0 (patch) | |
| tree | 0959175ca3144ff1d309ad86d751411ec98866bc | |
| parent | a6f2aeb76eda7f295a4baec825ca4c12027d036d (diff) | |
| download | drakx-e04b02c8243fd3e0769e9cb24e3ea39d9a3fc7b0.tar drakx-e04b02c8243fd3e0769e9cb24e3ea39d9a3fc7b0.tar.gz drakx-e04b02c8243fd3e0769e9cb24e3ea39d9a3fc7b0.tar.bz2 drakx-e04b02c8243fd3e0769e9cb24e3ea39d9a3fc7b0.tar.xz drakx-e04b02c8243fd3e0769e9cb24e3ea39d9a3fc7b0.zip | |
offer to configure sagem800 (needed because of unfriendly vpi/vci parameters)
| -rw-r--r-- | perl-install/network/netconnect.pm | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 2ae4c4ebe..468273c21 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); + my ($adsl_type, $adsl_protocol, $adsl_device, @adsl_devices, $adsl_failed, $adsl_answer, %adsl_data, $adsl_data, $adsl_provider); my ($ntf_name, $ipadr, $netadr, $gateway_ex, $up, $isdn, $isdn_type, $need_restart_network); my ($module, $text, $auto_ip, $onboot, $needhostname, $hotplug, $track_network_id, @fields); # lan config my $success = 1; @@ -544,6 +544,7 @@ killall pppd return 'adsl_unsupported_eci' if $adsl_device eq 'eci'; $netconnect::need_restart_network = member($adsl_device, qw(speedtouch eci)); $in->do_pkgs->install($packages{$adsl_device}) if $packages{$adsl_device}; + return 'adsl_sagem800' if $adsl_device eq 'sagem'; if ($adsl_device eq 'speedtouch' && !$::testing) { $in->do_pkgs->what_provides("speedtouch_mgmt") and $in->do_pkgs->ensure_is_installed('speedtouch_mgmt', '/usr/share/speedtouch/mgmt.o', 'auto'); @@ -553,6 +554,25 @@ killall pppd }, }, + + adsl_sagem800 => + { + pre => sub { + require network::adsl_consts; + %adsl_data = %network::adsl_consts::adsl_data; + }, + name => N("Please choose your ADSL provider"), + data => sub { + [ { label => N("Provider:"), type => "list", val => \$adsl_provider, separator => '|', list => [ keys %adsl_data ] } ]; + }, + next => 'adsl_protocol', + post => sub { + $adsl_data = $adsl_data{$adsl_provider}; + $adsl_protocol = $adsl_data->{method} if $adsl_data->{method}; + return 'adsl_protocol'; + }, + }, + adsl_speedtouch_firmware => { |