summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2004-02-20 15:59:01 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2004-02-20 15:59:01 +0000
commit4bab64362e02a53e4322f4f906d8dcf3769e48db (patch)
tree1dd2e1e605c1a6661066529cfb7c3bffe9cf1429
parent4bddfc96f970154a9f4c4655205c4328404acefb (diff)
downloaddrakx-4bab64362e02a53e4322f4f906d8dcf3769e48db.tar
drakx-4bab64362e02a53e4322f4f906d8dcf3769e48db.tar.gz
drakx-4bab64362e02a53e4322f4f906d8dcf3769e48db.tar.bz2
drakx-4bab64362e02a53e4322f4f906d8dcf3769e48db.tar.xz
drakx-4bab64362e02a53e4322f4f906d8dcf3769e48db.zip
keep provider vpi/vci settings when exist
-rw-r--r--perl-install/network/adsl.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index cd1811abb..ea75c7de5 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -75,7 +75,7 @@ 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}) =
+ ($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));
$pppoe_conf{DNS1} ||= '';
$pppoe_conf{DNS2} ||= '';