summaryrefslogtreecommitdiffstats
path: root/perl-install/network.pm
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-09-29 02:12:22 +0000
committerdamien <damien@mandriva.com>2000-09-29 02:12:22 +0000
commit9dc271a69126c966b2db2037ed0e89f989f7a8d5 (patch)
treecbb36c21c73569a57fcd53a4170da72c219afb86 /perl-install/network.pm
parent9a167fa4c87158b4f6e225dbb46cea8386ed3fe6 (diff)
downloaddrakx-9dc271a69126c966b2db2037ed0e89f989f7a8d5.tar
drakx-9dc271a69126c966b2db2037ed0e89f989f7a8d5.tar.gz
drakx-9dc271a69126c966b2db2037ed0e89f989f7a8d5.tar.bz2
drakx-9dc271a69126c966b2db2037ed0e89f989f7a8d5.tar.xz
drakx-9dc271a69126c966b2db2037ed0e89f989f7a8d5.zip
stc
Diffstat (limited to 'perl-install/network.pm')
-rw-r--r--perl-install/network.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 62aa592c5..b91c66cdd 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -88,12 +88,11 @@ sub write_resolv_conf {
my (%search, %dns, @unknown);
local *F; open F, $file;
- my $dns_auto;
foreach (<F>) {
/^[#\s]*search\s+(.*?)\s*$/ and $search{$1} = $., next;
/^[#\s]*nameserver\s+(.*?)\s*$/ and $dns{$1} = $., next;
+ /^.*# ppp temp entry\s*$/ and next;
/^[#\s]*(\S.*?)\s*$/ and push @unknown, $1;
- /^# ppp temp entry$/ and $dns_auto=1;
}
close F; open F, ">$file" or die "cannot write $file: $!";
@@ -101,9 +100,10 @@ sub write_resolv_conf {
print F "search $netc->{DOMAINNAME} $netc->{DOMAINNAME2}\n\n" if ($netc->{DOMAINNAME} || $netc->{DOMAINNAME2});
print F "# nameserver $_\n" foreach grep { ! exists $used_dns{$_} } sort { $dns{$a} <=> $dns{$b} } keys %dns;
print F "nameserver $_\n" foreach sort { $used_dns{$a} <=> $used_dns{$b} } grep { $_ } keys %used_dns;
- $dns_auto or print F "# ppp temp entry\n";
print F "\n";
print F "# $_\n" foreach @unknown;
+ print F "\n";
+ print F "# ppp temp entry\n";
#-res_init(); # reinit the resolver so DNS changes take affect
1;