diff options
| author | damien <damien@mandriva.com> | 2001-09-10 19:48:41 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-09-10 19:48:41 +0000 |
| commit | c461723804838cb6b1feeb2c16e578a23bffea24 (patch) | |
| tree | 8c3e9d50eb874805e4a0dd64b3daedd9e25c10a3 /perl-install/network | |
| parent | 040ad1f810b47d2f6fb3879ca089060646e85d42 (diff) | |
| download | drakx-c461723804838cb6b1feeb2c16e578a23bffea24.tar drakx-c461723804838cb6b1feeb2c16e578a23bffea24.tar.gz drakx-c461723804838cb6b1feeb2c16e578a23bffea24.tar.bz2 drakx-c461723804838cb6b1feeb2c16e578a23bffea24.tar.xz drakx-c461723804838cb6b1feeb2c16e578a23bffea24.zip | |
removed timeout:1 in resolv.conf, modified timeout scanning in draknet/net_monitor
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/network.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 75dcedf8d..5676fb999 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -91,20 +91,20 @@ sub write_resolv_conf { my (%search, %dns, @unknown); local *F; open F, $file; local $_; - my $options; +#- my $options; while (<F>) { - if (/^[\s]*(options\s+[^#]*).*$/) { $options = $1; $options =~ s/timeout:\d+/timeout:1/; next } +#- if (/^[\s]*(options\s+[^#]*).*$/) { $options = $1; $options =~ s/timeout:\d+/timeout:1/; next } /^[#\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; } - $options ||= "options timeout:1"; +#- $options ||= "options timeout:1"; close F; open F, ">$file" or die "cannot write $file: $!"; print F "# search $_\n" foreach grep { $_ ne "$netc->{DOMAINNAME} $netc->{DOMAINNAME2}" } sort { $search{$a} <=> $search{$b} } keys %search; print F "search $netc->{DOMAINNAME} $netc->{DOMAINNAME2}\n" if ($netc->{DOMAINNAME} || $netc->{DOMAINNAME2}); - print F "$options\n\n"; +#- print F "$options\n\n"; 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; print F "\n"; |