summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-03-07 13:35:06 +0000
committerFrancois Pons <fpons@mandriva.com>2003-03-07 13:35:06 +0000
commit981a7e0297e29911cfe13a867bb8eb8b105f0abe (patch)
tree850d697235480f09ebe421c591fbc2411ea85d96
parentb183a236998defe202371f54b84343881e84514b (diff)
downloaddrakx-981a7e0297e29911cfe13a867bb8eb8b105f0abe.tar
drakx-981a7e0297e29911cfe13a867bb8eb8b105f0abe.tar.gz
drakx-981a7e0297e29911cfe13a867bb8eb8b105f0abe.tar.bz2
drakx-981a7e0297e29911cfe13a867bb8eb8b105f0abe.tar.xz
drakx-981a7e0297e29911cfe13a867bb8eb8b105f0abe.zip
dropped a line.
-rw-r--r--perl-install/network/adsl.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 9eacb9492..cf5054a5e 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -76,8 +76,7 @@ sub adsl_ask_info {
my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if $adsl_type =~ /pppoe/ && -f $pppoe_file;
my $login = $pppoe_conf{USER};
foreach (qw(/etc/ppp/peers/adsl /etc/ppp/options /etc/ppp/options.adsl)) {
- next if $login || ! -r "$prefix/$_";
- ($login) = map { if_(/^user\s+\"([^\"]+)\"/, $1) } cat_("$prefix/$_");
+ ($login) = map { if_(/^user\s+\"([^\"]+)\"/, $1) } cat_("$prefix/$_") if !$login && -r "$prefix/$_";
}
($login) = map { if_(/\sname\s+([^ \n]+)/, $1) } cat_($pptp_file) if $adsl_type =~ /pptp/ && -r $pptp_file;
my $passwd = passwd_by_login($login);