summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-23 15:06:54 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-23 15:06:54 +0000
commitbde42b034b2fcb3dec041e07c87ad776a52f7af0 (patch)
tree78147a56c4573f151a9ef56699712d47a024b7f9
parente3db07885e7cf11f503a4a05faba554de3787611 (diff)
downloaddrakx-bde42b034b2fcb3dec041e07c87ad776a52f7af0.tar
drakx-bde42b034b2fcb3dec041e07c87ad776a52f7af0.tar.gz
drakx-bde42b034b2fcb3dec041e07c87ad776a52f7af0.tar.bz2
drakx-bde42b034b2fcb3dec041e07c87ad776a52f7af0.tar.xz
drakx-bde42b034b2fcb3dec041e07c87ad776a52f7af0.zip
(adsl_probe_info) make it aware of the fact we now see the adsl modem
and protocol separatly
-rw-r--r--perl-install/network/adsl.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 32deeacfe..b5cd82fed 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -89,7 +89,7 @@ If you don't know, choose 'use pppoe'"),
};
sub adsl_probe_info {
- my ($adsl, $netc, $adsl_type) = @_;
+ my ($adsl, $netc, $adsl_type, $adsl_modem) = @_;
my $pppoe_file = "$prefix/etc/ppp/pppoe.conf";
my $pptp_file = "$prefix/etc/sysconfig/network-scripts/net_cnx_up";
my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if (! defined $adsl_type || $adsl_type =~ /pppoe/) && -f $pppoe_file;
@@ -99,7 +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);
- $adsl_type eq 'speedtouch' and ($netc->{vpivci}) = map { if_(/^.*-vpi\s+(\d+)\s+-vci\s+(\d+)/, "$1_$2") } cat_("$prefix/etc/ppp/peers/adsl");
+ ($netc->{vpivci}) =
+ map { if_(/^.*-vpi\s+(\d+)\s+-vci\s+(\d+)/, "$1_$2") } cat_("$prefix/etc/ppp/peers/adsl") if $adsl_modem eq 'speedtouch';
$pppoe_conf{DNS1} ||= '';
$pppoe_conf{DNS2} ||= '';
add2hash($netc, { dnsServer2 => $pppoe_conf{DNS1}, dnsServer3 => $pppoe_conf{DNS2}, DOMAINNAME2 => '' });