Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > d60bd1f35e0c82afb5f88d78afd23ee9 > files > 6

NetworkManager-0.7.0-9.el5.src.rpm

diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 NetworkManager-0.7.0/src/named-manager/nm-named-manager.c
--- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2	2008-11-28 10:31:40.000000000 -0500
+++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c	2009-04-20 15:11:16.000000000 -0400
@@ -243,7 +243,7 @@ write_resolv_conf (FILE *f, const char *
 		g_free (tmp_str);
 	}
 
-	if (nameservers) {
+	if (nameservers && g_strv_length (nameservers)) {
 		GString *str;
 		int num;
 
@@ -265,6 +265,14 @@ write_resolv_conf (FILE *f, const char *
 		}
 
 		nameservers_str = g_string_free (str, FALSE);
+	} else {
+		nameservers_str = g_strdup_printf ("\n\n%s%s%s%s%s%s",
+		                                   "# No nameservers found; try putting DNS servers into your\n",
+		                                   "# ifcfg files in /etc/sysconfig/network-scripts like so:\n",
+		                                   "#\n",
+		                                   "# DNS1=xxx.xxx.xxx.xxx\n",
+		                                   "# DNS2=xxx.xxx.xxx.xxx\n",
+		                                   "# DOMAIN=lab.foo.com bar.foo.com\n");
 	}
 
 	if (fprintf (f, "%s%s%s",