summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2003-08-27 18:15:40 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2003-08-27 18:15:40 +0000
commit63b3f9064837c82df6da0b08f08c642aaef00e77 (patch)
tree6f37ef2b4df44af484da18843828d3f739a2ce2d
parentda40afec833ba8298e9627adcd7aeed4b10a59f8 (diff)
downloaddrakx-63b3f9064837c82df6da0b08f08c642aaef00e77.tar
drakx-63b3f9064837c82df6da0b08f08c642aaef00e77.tar.gz
drakx-63b3f9064837c82df6da0b08f08c642aaef00e77.tar.bz2
drakx-63b3f9064837c82df6da0b08f08c642aaef00e77.tar.xz
drakx-63b3f9064837c82df6da0b08f08c642aaef00e77.zip
fix #4363 (titi's so beautiful)
-rw-r--r--perl-install/network/adsl.pm19
1 files changed, 12 insertions, 7 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 6c0bcd279..6a1f82538 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -15,16 +15,21 @@ sub configure {
my ($netcnx, $netc, $intf, $first_time) = @_;
conf_adsl_step1:
- my $l = [ N_("use pppoe"),
- N_("use pptp"),
- N_("use dhcp"),
- N_("Alcatel speedtouch usb") . if_($netc->{autodetect}{adsl}{speedtouch}, " - detected"),
- N_("Sagem (using pppoa) usb") . if_($netc->{autodetect}{adsl}{sagem}, " - detected"),
- ];
+ my %l = (
+ 'pppoe' => N_("use pppoe"),
+ 'pptp' => N_("use pptp"),
+ 'dhcp' => N_("use dhcp"),
+ 'speedtouch' => N_("Alcatel speedtouch usb") . if_($netc->{autodetect}{adsl}{speedtouch}, " - detected"),
+ 'sagem' => N_("Sagem (using pppoa) usb") . if_($netc->{autodetect}{adsl}{sagem}, " - detected"),
+ );
+
my $type = $in->ask_from_list_(N("Connect to the Internet"),
N("The most common way to connect with adsl is pppoe.
Some connections use pptp, a few use dhcp.
-If you don't know, choose 'use pppoe'"), $l) or return;
+If you don't know, choose 'use pppoe'"),
+ [ sort values %l ],
+ $l{ find { defined $netc->{autodetect}{adsl}{$_} } keys %l }
+ ) or return;
$type =~ s/use //;
if ($type eq 'pppoe') {
$in->do_pkgs->install("rp-$type");