diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/network/network.pm | 11 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- 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 fa8df00..26f4600 100644 --- a/lib/network/network.pm +++ b/lib/network/network.pm @@ -126,10 +126,17 @@ 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}; - my $file = $::prefix . $resolv_file; + # (bug #54180) + #my $file = $::prefix . $resolv_file; + my $file = $::prefix . "/etc/resolvconf/run/interface/" . $net->{net_interface}; my %new = ( search => [ grep { $_ } uniq(@$resolv{'DOMAINNAME', 'DOMAINNAME2', 'DOMAINNAME3'}) ], @@ -165,6 +172,8 @@ 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 { |