summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-09-06 14:49:05 +0000
committerdamien <damien@mandriva.com>2001-09-06 14:49:05 +0000
commit1b769c0ffdb5cb69a3e665e6df43c8633b92a6f4 (patch)
treeafd2f9ceceba2f86cac8291a313632fec56018ed
parentf607542b5e59f49757657ee960ad65eba4c7433c (diff)
downloaddrakx-1b769c0ffdb5cb69a3e665e6df43c8633b92a6f4.tar
drakx-1b769c0ffdb5cb69a3e665e6df43c8633b92a6f4.tar.gz
drakx-1b769c0ffdb5cb69a3e665e6df43c8633b92a6f4.tar.bz2
drakx-1b769c0ffdb5cb69a3e665e6df43c8633b92a6f4.tar.xz
drakx-1b769c0ffdb5cb69a3e665e6df43c8633b92a6f4.zip
corrected speedtouch
-rw-r--r--perl-install/network/adsl.pm5
-rw-r--r--perl-install/network/tools.pm4
2 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 376683a25..94698996b 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -109,7 +109,7 @@ defaultroute
}
if ($adsl_type eq 'speedtouch') {
- $netc->{vpivci} =~ /(\d+)\.(\d+)/;
+ $netc->{vpivci} =~ /(\d+)_(\d+)/;
output("$prefix/etc/ppp/peers/adsl",
qq{noauth
noipdefault
@@ -124,7 +124,6 @@ holdoff 4
maxfail 25
persist
usepeerdns
-$USERLINE
defaultroute
user "$adsl->{login}"
});
@@ -137,7 +136,7 @@ user "$adsl->{login}"
['ppp-compress-26', 'ppp_deflate']);
$::isStandalone and modules::write_conf($prefix);
$in->ask_warn('', _('You need the alcatel microcode.
-Downlaod it at
+Download it at
http://www.alcatel.com/consumer/dsl/dvrreg_lx.htm
and copy the mgmt.o in /usr/share/speedtouch'))
}
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index efb7f1bed..9fede9a88 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -90,8 +90,8 @@ sub ask_info2 {
]
) or return;
if ($netc->{vpivci}) {
- foreach (['Netherlands', 8.48], ['France', 8.35], ['Belgium', 8.35], ['Italy', 8.35], ['UK', 0.38]) {
- $netc->{vpivci} eq $_->[0] and $netc->{vpivci} = $_->[1] ;
+ foreach (['Netherlands', '8_48'], ['France', '8_35'], ['Belgium', '8_35'], ['Italy', '8_35'], ['UK', '0_38']) {
+ $netc->{vpivci} eq $_->[0] and $netc->{vpivci} = $_->[1];
}
}
1;