diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-27 11:20:23 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-27 11:20:23 +0000 |
| commit | 7f525ce07fca4398000d1254099fab94acab6f50 (patch) | |
| tree | 9b648210a522743762e3d4fce56089e4c4c311b7 | |
| parent | d24187af4c974649d5776c8db897dd9bcdb6d4eb (diff) | |
| download | drakx-7f525ce07fca4398000d1254099fab94acab6f50.tar drakx-7f525ce07fca4398000d1254099fab94acab6f50.tar.gz drakx-7f525ce07fca4398000d1254099fab94acab6f50.tar.bz2 drakx-7f525ce07fca4398000d1254099fab94acab6f50.tar.xz drakx-7f525ce07fca4398000d1254099fab94acab6f50.zip | |
(adsl_probe_info) vpi and vci parameters are independant
| -rw-r--r-- | perl-install/network/adsl.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index 7dc706cf1..399cacd22 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -99,8 +99,8 @@ sub adsl_probe_info { } ($login) = map { if_(/\sname\s+([^ \n]+)/, $1) } cat_($pptp_file) if (! defined $adsl_type || $adsl_type =~ /pptp/) && -r $pptp_file; my $passwd = passwd_by_login($login); - ($netc->{vpivci}) = - map { if_(/^.*-vpi\s+(\d+)\s+-vci\s+(\d+)/, "$1_$2") } cat_("$::prefix/etc/ppp/peers/adsl") if $adsl_modem eq 'speedtouch'; + ($netc->{vpi}, $netc->{vci}) = + map { if_(/^.*-vpi\s+(\d+)\s+-vci\s+(\d+)/, $1, $2) } cat_("$::prefix/etc/ppp/peers/adsl") if $adsl_modem =~ /eci|speedtouch/; $pppoe_conf{DNS1} ||= ''; $pppoe_conf{DNS2} ||= ''; add2hash($netc, { dnsServer2 => $pppoe_conf{DNS1}, dnsServer3 => $pppoe_conf{DNS2}, DOMAINNAME2 => '' }); |