diff options
| author | Claudio Matsuoka <claudio@mandriva.com> | 2010-03-08 19:38:34 +0000 |
|---|---|---|
| committer | Claudio Matsuoka <claudio@mandriva.com> | 2010-03-08 19:38:34 +0000 |
| commit | b57d543108c3f7742f7cf5a62e70f63e36e4da8b (patch) | |
| tree | d86c2541ba9698e60616fbc4146421a081be338c | |
| parent | ca28ecf6c30c69549e8e959870fd31bec5420aa1 (diff) | |
| download | drakx-net-b57d543108c3f7742f7cf5a62e70f63e36e4da8b.tar drakx-net-b57d543108c3f7742f7cf5a62e70f63e36e4da8b.tar.gz drakx-net-b57d543108c3f7742f7cf5a62e70f63e36e4da8b.tar.bz2 drakx-net-b57d543108c3f7742f7cf5a62e70f63e36e4da8b.tar.xz drakx-net-b57d543108c3f7742f7cf5a62e70f63e36e4da8b.zip | |
Revert previous 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) - Don't guess gateway and nameserver if not specified (closes: #28033) - Change prism54 wifi driver to p54pci/p54usb (bug #52018) 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 { |