summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-16 07:04:06 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-16 07:04:06 +0000
commite088299f45acc8ad171925ba12cfe5fd792fc268 (patch)
tree0e553e46a89b8111efe8f70f34603f35bd8778bb
parent2f02cc2c4dffe53e63517e629d10d04cc0b45f5b (diff)
downloaddrakx-e088299f45acc8ad171925ba12cfe5fd792fc268.tar
drakx-e088299f45acc8ad171925ba12cfe5fd792fc268.tar.gz
drakx-e088299f45acc8ad171925ba12cfe5fd792fc268.tar.bz2
drakx-e088299f45acc8ad171925ba12cfe5fd792fc268.tar.xz
drakx-e088299f45acc8ad171925ba12cfe5fd792fc268.zip
(adsl_probe_info) net_cnx_up is obsolete, pptp info is available in
ppp config files
-rw-r--r--perl-install/network/adsl.pm2
1 files changed, 0 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index da4b0b5fb..41d9894e9 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -67,13 +67,11 @@ If you don't know, choose 'use pppoe'"),
sub adsl_probe_info {
my ($adsl, $netc, $adsl_type, $o_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 eq 'pppoe') && -f $pppoe_file;
my $login = $pppoe_conf{USER};
foreach (qw(/etc/ppp/peers/ppp0 /etc/ppp/options /etc/ppp/options.adsl)) {
($login) = map { if_(/^user\s+"([^"]+)"/, $1) } cat_("$::prefix/$_") if !$login && -r "$::prefix/$_";
}
- ($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);
if (!$netc->{vpi} && !$netc->{vpi} && member($o_adsl_modem, qw(eci speedtouch))) {
($netc->{vpi}, $netc->{vci}) =