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

Index: NetworkManager-1.0.12/src/dns-manager/nm-dns-manager.c
===================================================================
--- NetworkManager-1.0.12.orig/src/dns-manager/nm-dns-manager.c
+++ NetworkManager-1.0.12/src/dns-manager/nm-dns-manager.c
@@ -315,7 +315,7 @@ dispatch_netconfig (char **searches,
 	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, 2000, 0)) {
 		int errsv = errno;
 
 		g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_FAILED,