diff options
| author | Arnaud Desmons <adesmons@mandriva.com> | 2002-12-06 11:01:59 +0000 |
|---|---|---|
| committer | Arnaud Desmons <adesmons@mandriva.com> | 2002-12-06 11:01:59 +0000 |
| commit | b8c50cf70eb80b5bcaedcaf6117549ff83bc36cd (patch) | |
| tree | c8e340107a55c3b52c8d476a8cb613655c00856b /perl-install/network/adsl.pm | |
| parent | 9209a6b92d9c5a84e588f401aca4a1b17f43650e (diff) | |
| download | drakx-b8c50cf70eb80b5bcaedcaf6117549ff83bc36cd.tar drakx-b8c50cf70eb80b5bcaedcaf6117549ff83bc36cd.tar.gz drakx-b8c50cf70eb80b5bcaedcaf6117549ff83bc36cd.tar.bz2 drakx-b8c50cf70eb80b5bcaedcaf6117549ff83bc36cd.tar.xz drakx-b8c50cf70eb80b5bcaedcaf6117549ff83bc36cd.zip | |
isdn data are now fetched form system instead of drakconnect conf file
Diffstat (limited to 'perl-install/network/adsl.pm')
| -rw-r--r-- | perl-install/network/adsl.pm | 4 |
1 files changed, 3 insertions, 1 deletions
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); } |