File nm-dont-overwrite-resolv-conf.patch of Package NetworkManager.11070

Index: NetworkManager-1.10.2/src/dns/nm-dns-manager.c
===================================================================
--- NetworkManager-1.10.2.orig/src/dns/nm-dns-manager.c
+++ NetworkManager-1.10.2/src/dns/nm-dns-manager.c
@@ -435,7 +435,7 @@ dispatch_netconfig (NMDnsManager *self,
 	nm_close (fd);
 
 	/* Wait until the process exits */
-	if (!nm_utils_kill_child_sync (pid, 0, LOGD_DNS, "netconfig", &status, 1000, 0)) {
+	if (!nm_utils_kill_child_sync (pid, 0, LOGD_DNS, "netconfig", &status, 0, 0)) {
 		int errsv = errno;
 
 		g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_FAILED,