diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-22 23:24:32 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-22 23:24:32 +0000 |
| commit | 9df9c0ef1f1c5121ac4a2d0c6b3adaff3e7b082b (patch) | |
| tree | cf8aedbaadaa3b3457097a7f47999a146a22d0a4 | |
| parent | 936151d5c0e0dd6edefb0d8d70456d0c32bb2555 (diff) | |
| download | drakx-backup-do-not-use-9df9c0ef1f1c5121ac4a2d0c6b3adaff3e7b082b.tar drakx-backup-do-not-use-9df9c0ef1f1c5121ac4a2d0c6b3adaff3e7b082b.tar.gz drakx-backup-do-not-use-9df9c0ef1f1c5121ac4a2d0c6b3adaff3e7b082b.tar.bz2 drakx-backup-do-not-use-9df9c0ef1f1c5121ac4a2d0c6b3adaff3e7b082b.tar.xz drakx-backup-do-not-use-9df9c0ef1f1c5121ac4a2d0c6b3adaff3e7b082b.zip | |
factorize out adsl protocols' translations
| -rw-r--r-- | perl-install/network/netconnect.pm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 409285631..6f170898c 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_device, @adsl_devices, $adsl_failed, $adsl_answer); + my ($adsl_type, $adsl_protocol, $adsl_device, @adsl_devices, $adsl_failed, $adsl_answer); 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; @@ -153,6 +153,14 @@ sub get_subwizard { eci => N("ECI Hi-Focus modem"), # this one needs eci agreement ); + my %adsl_types = ( + dhcp => N("Dynamic Host Configuration Protocol (DHCP)"), + manual => N("Manual TCP/IP configuration"), + ppptp => N("Point to Point Tuneling Protocol (PPPTP)"), + pppoe => N("PPP over Ethernet (PPPoE)"), + pppoa => N("PPP over ATM (PPPoA)"), + ); + # main wizard: my $wiz; @@ -610,14 +618,8 @@ and copy the mgmt.o in /usr/share/speedtouch", 'http://prdownloads.sourceforge.n Some connections use pptp, a few use dhcp. If you don't know, choose 'use pppoe'"), data => [ - { text => N("ADSL connection type :"), val => \$adsl_type, type => "list", - list => [ - N("Dynamic Host Configuration Protocol (DHCP)"), - N("Manual TCP/IP configuration"), - N("Point to Point Tuneling Protocol (PPPTP)"), - N("PPP over Ethernet (PPPoE)"), - N("PPP over ATM (PPPoA)"), - ], + { text => N("ADSL connection type :"), val => \$adsl_protocol, type => "list", + list => [ values %adsl_types ], }, ], }, |