From b43b55f6319184590c5921a841ae9061217983b6 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 16 Sep 2005 14:46:40 +0000
Subject: fix probing of login name for pppoe connections (peers file is more
 important than pppoe.conf)

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

(limited to 'perl-install/network')

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 8939682d2..eb53bdc3d 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -12,11 +12,12 @@ use vars qw(@ISA @EXPORT);
 sub adsl_probe_info {
     my ($net) = @_;
     my $pppoe_file = "$::prefix/etc/ppp/pppoe.conf";
-    my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if (!exists $net->{adsl}{method} || $net->{adsl}{method} eq 'pppoe') && -f $pppoe_file;
-    my $login = $pppoe_conf{USER};
+    my $login;
     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/$_";
     }
+    my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if (!exists $net->{adsl}{method} || $net->{adsl}{method} eq 'pppoe') && -f $pppoe_file;
+    $login ||= $pppoe_conf{USER};
     my $passwd = network::tools::passwd_by_login($login);
     if (!$net->{adsl}{vpi} && !$net->{adsl}{vci}) {
       ($net->{adsl}{vpi}, $net->{adsl}{vci}) =
-- 
cgit v1.2.1