diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-26 11:08:11 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-26 11:08:11 +0000 |
| commit | 9a752d67cbc922fceff7cc006ff4441a56a49aaa (patch) | |
| tree | 443dc8845c4ce4bb9ce0b448ee5be33c660bf303 /perl-install | |
| parent | e7341d2e76655f2c7a8cf16374ca37cb66fba69c (diff) | |
| download | drakx-9a752d67cbc922fceff7cc006ff4441a56a49aaa.tar drakx-9a752d67cbc922fceff7cc006ff4441a56a49aaa.tar.gz drakx-9a752d67cbc922fceff7cc006ff4441a56a49aaa.tar.bz2 drakx-9a752d67cbc922fceff7cc006ff4441a56a49aaa.tar.xz drakx-9a752d67cbc922fceff7cc006ff4441a56a49aaa.zip | |
(adsl_probe_info) fix "manage interface" that broke speedtouch configuration
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/network/adsl.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index c5411926e..f9d43e810 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -75,8 +75,10 @@ sub adsl_probe_info { } ($login) = map { if_(/\sname\s+([^ \n]+)/, $1) } cat_($pptp_file) if (! defined $adsl_type || $adsl_type eq 'pptp') && -r $pptp_file; my $passwd = passwd_by_login($login); - ($netc->{vpi}, $netc->{vci}) ||= - map { if_(/^.*-vpi\s+(\d+)\s+-vci\s+(\d+)/, $1, $2) } cat_("$::prefix/etc/ppp/peers/adsl") if member($adsl_modem, qw(eci speedtouch)); + if (!$netc->{vpi} && !$netc->{vpi} &&member($adsl_modem, qw(eci speedtouch))) { + ($netc->{vpi}, $netc->{vci}) = + (map { if_(/^.*-vpi\s+(\d+)\s+-vci\s+(\d+)/, $1, $2) } cat_("$::prefix/etc/ppp/peers/adsl")) ; + } $pppoe_conf{DNS1} ||= ''; $pppoe_conf{DNS2} ||= ''; add2hash($netc, { dnsServer2 => $pppoe_conf{DNS1}, dnsServer3 => $pppoe_conf{DNS2}, DOMAINNAME2 => '' }); |