From 9a752d67cbc922fceff7cc006ff4441a56a49aaa Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Fri, 26 Mar 2004 11:08:11 +0000
Subject: (adsl_probe_info) fix "manage interface" that broke speedtouch
 configuration

---
 perl-install/network/adsl.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'perl-install/network')

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 => '' });
-- 
cgit v1.2.1