From b8c50cf70eb80b5bcaedcaf6117549ff83bc36cd Mon Sep 17 00:00:00 2001
From: Arnaud Desmons <adesmons@mandriva.com>
Date: Fri, 6 Dec 2002 11:01:59 +0000
Subject: isdn data are now fetched form system instead of drakconnect conf
 file

---
 perl-install/network/adsl.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/network/adsl.pm')

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index b895f90fd..8a88468ab 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -86,7 +86,9 @@ sub adsl_ask_info {
     my ($adsl, $netc, $_intf, $adsl_type) = @_;
     my $pppoe_file = "/etc/ppp/pppoe.conf";
     my $pppoe_conf = { getVarsFromSh($pppoe_file) } if $adsl_type =~ /pppoe/ && -f $pppoe_file;
-    add2hash($netc, { dnsServer2 => '', dnsServer3 => '', DOMAINNAME2 => '' });
+    $pppoe_conf->{DNS1} ||= '';
+    $pppoe_conf->{DNS2} ||= '';
+    add2hash($netc, { dnsServer2 => $pppoe_conf->{DNS1}, dnsServer3 => $pppoe_conf->{DNS2}, DOMAINNAME2 => '' });
     add2hash($adsl, { login => $pppoe_conf->{USER}, passwd => '', passwd2 => '' });
     ask_info2($adsl, $netc);
 }
-- 
cgit v1.2.1