diff options
| author | Claudio Matsuoka <claudio@mandriva.com> | 2010-03-08 19:22:46 +0000 |
|---|---|---|
| committer | Claudio Matsuoka <claudio@mandriva.com> | 2010-03-08 19:22:46 +0000 |
| commit | a2c08c3e562f556e4613881dbaa8eb2321d988da (patch) | |
| tree | 7ad8c76f3627b1f976343d195be665ca092b8d3e | |
| parent | 44ee35e262f43f895c654627e3f2d567a4455200 (diff) | |
| download | drakx-net-a2c08c3e562f556e4613881dbaa8eb2321d988da.tar drakx-net-a2c08c3e562f556e4613881dbaa8eb2321d988da.tar.gz drakx-net-a2c08c3e562f556e4613881dbaa8eb2321d988da.tar.bz2 drakx-net-a2c08c3e562f556e4613881dbaa8eb2321d988da.tar.xz drakx-net-a2c08c3e562f556e4613881dbaa8eb2321d988da.zip | |
Revert code to write to resolvconf (shouldn't be done) (#54180)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/network/network.pm | 11 |
2 files changed, 1 insertions, 12 deletions
@@ -1,5 +1,3 @@ -- write name servers to correct file (/etc/resolvconf/run/interfaces/<iface> - instead of /etc/resolv.conf which gets overwritten) (#54180) - properly update /etc/hosts file when there are multiple aliases for the the same ip (#30168). - ndiswrapper support: diff --git a/lib/network/network.pm b/lib/network/network.pm index 26f4600..fa8df00 100644 --- a/lib/network/network.pm +++ b/lib/network/network.pm @@ -126,17 +126,10 @@ sub write_zeroconf { services::set_status('tmdns', $net->{zeroconf}{hostname}, $::isInstall); } -sub update_resolv_conf { - # is there a better way to do this? - system "/etc/init.d/resolvconf reload"; -} - sub write_resolv_conf { my ($net) = @_; my $resolv = $net->{resolv}; - # (bug #54180) - #my $file = $::prefix . $resolv_file; - my $file = $::prefix . "/etc/resolvconf/run/interface/" . $net->{net_interface}; + my $file = $::prefix . $resolv_file; my %new = ( search => [ grep { $_ } uniq(@$resolv{'DOMAINNAME', 'DOMAINNAME2', 'DOMAINNAME3'}) ], @@ -172,8 +165,6 @@ sub write_resolv_conf { }; output_with_perm($file, 0644, @search, @nameserver, (map { "# $_\n" } @unknown), "\n# ppp temp entry\n"); - update_resolv_conf(); - #-res_init(); # reinit the resolver so DNS changes take affect 1; } else { |