From 44ee35e262f43f895c654627e3f2d567a4455200 Mon Sep 17 00:00:00 2001
From: Claudio Matsuoka <claudio@mandriva.com>
Date: Thu, 4 Mar 2010 19:43:57 +0000
Subject: write name servers to correct file (#54180)

---
 lib/network/network.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'lib/network/network.pm')

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 {
-- 
cgit v1.2.1