summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-03-06 14:27:35 +0000
committerFrancois Pons <fpons@mandriva.com>2003-03-06 14:27:35 +0000
commit3d6c51e4efe79b2ee8bef21fbc834b744cbffa5a (patch)
tree8a567a9d11deb6d0f8f67a5c4fcb053bcf39f98b
parentcdd491ef4af8baf94cb85b6906f6ba7c7da8d4f5 (diff)
downloaddrakx-backup-do-not-use-3d6c51e4efe79b2ee8bef21fbc834b744cbffa5a.tar
drakx-backup-do-not-use-3d6c51e4efe79b2ee8bef21fbc834b744cbffa5a.tar.gz
drakx-backup-do-not-use-3d6c51e4efe79b2ee8bef21fbc834b744cbffa5a.tar.bz2
drakx-backup-do-not-use-3d6c51e4efe79b2ee8bef21fbc834b744cbffa5a.tar.xz
drakx-backup-do-not-use-3d6c51e4efe79b2ee8bef21fbc834b744cbffa5a.zip
fixed adsl login not probed in install mode.
-rw-r--r--perl-install/network/adsl.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index a09f58ee3..1768ec1dc 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -71,13 +71,13 @@ If you don't know, choose 'use pppoe'"), $l) or return;
sub adsl_ask_info {
my ($adsl, $netc, $_intf, $adsl_type) = @_;
- my $pppoe_file = "/etc/ppp/pppoe.conf";
- my $pptp_file = '/etc/sysconfig/network-scripts/net_cnx_up';
+ 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 $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 $_;
- ($login) = map { if_(/^user\s+\"([^\"]+)\"/, $1) } cat_($_);
+ next if $login && ! -r "$prefix/$_";
+ ($login) = map { if_(/^user\s+\"([^\"]+)\"/, $1) } cat_("$prefix/$_");
}
($login) = map { if_(/\sname\s+([^ \n]+)/, $1) } cat_($pptp_file) if $adsl_type =~ /pptp/ && -r $pptp_file;
my $passwd = passwd_by_login($login);