summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-06 14:07:25 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-06 14:07:25 +0000
commit658f028abc50486955e99d7083cdff8e07088e6f (patch)
tree7c999fb7c9a77df0805fbf3268fdd5e3351894df /perl-install/install_steps.pm
parent363aab7a71a0b505c780b763b22bcd5131995382 (diff)
downloaddrakx-658f028abc50486955e99d7083cdff8e07088e6f.tar
drakx-658f028abc50486955e99d7083cdff8e07088e6f.tar.gz
drakx-658f028abc50486955e99d7083cdff8e07088e6f.tar.bz2
drakx-658f028abc50486955e99d7083cdff8e07088e6f.tar.xz
drakx-658f028abc50486955e99d7083cdff8e07088e6f.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm16
1 files changed, 6 insertions, 10 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index fc60af16e..df669f465 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -392,11 +392,14 @@ sub pppConfig {
install_any::pkg_install($o, "ppp");
my %toreplace;
- $toreplace{$_} = $o->{modem}{$_} foreach qw(connection phone login passwd auth domain);
- $toreplace{kpppauth} = ${{ 'Script-based' => 0, PAP => 1, 'Terminal-based' => 2, CHAP => 3, }}{$o->{modem}{auth}}; #'
- $toreplace{phone} =~ s/[^\d]//g;
+ $toreplace{$_} = $o->{modem}{$_} foreach qw(connection phone login passwd auth domain dns1 dns2);
+ $toreplace{kpppauth} = ${{ 'Script-based' => 0, 'PAP' => 1, 'Terminal-based' => 2, 'CHAP' => 3, }}{$o->{modem}{auth}};
+ $toreplace{phone} =~ s/\D//g;
$toreplace{dnsserver} = join '', map { "$o->{modem}{$_}," } "dns1", "dns2";
+ #- using peerdns or dns1,dns2 avoid writing a /etc/resolv.conf file.
+ $toreplace{peerdns} = "yes";
+
$toreplace{connection} ||= 'DialupConnection';
$toreplace{domain} ||= 'localdomain';
$toreplace{intf} ||= 'ppp0';
@@ -421,13 +424,6 @@ sub pppConfig {
template2file("/usr/share/chat-ppp.script.in", "$o->{prefix}/etc/sysconfig/network-scripts/chat-ppp0", %toreplace);
} #- no CHAP currently.
- #- build /etc/resolv.conf according to ppp configuration since there is no other network configuration.
- open F, ">$o->{prefix}/etc/resolv.conf" or die "Can't open $o->{prefix}/etc/resolv.conf $!";
- print F "domain $o->{modem}{domain}\n";
- print F "nameserver $o->{modem}{dns1}\n" if $o->{modem}{dns1};
- print F "nameserver $o->{modem}{dns2}\n" if $o->{modem}{dns2};
- close F;
-
install_any::template2userfile($o->{prefix}, "$ENV{SHARE_PATH}/kppprc.in", ".kde/share/config/kppprc", 1, %toreplace);
miscellaneousNetwork($o);