8945c4b
diff -up NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c.explain-dns1-dns2 NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c
8945c4b
--- NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c.explain-dns1-dns2	2010-10-18 18:44:05.000000000 -0500
8945c4b
+++ NetworkManager-0.8.2/src/dns-manager/nm-dns-manager.c	2010-11-03 13:51:56.614584001 -0500
8945c4b
@@ -358,7 +358,7 @@ write_resolv_conf (FILE *f, const char *
8945c4b
 
8945c4b
 	str = g_string_new ("");
716eed3
 
716eed3
-	if (nameservers) {
716eed3
+	if (nameservers && g_strv_length (nameservers)) {
8945c4b
 		int num = g_strv_length (nameservers);
c9bde83
 
8945c4b
 		for (i = 0; i < num; i++) {
8945c4b
@@ -374,6 +374,14 @@ write_resolv_conf (FILE *f, const char *
8945c4b
 			g_string_append (str, nameservers[i]);
8945c4b
 			g_string_append_c (str, '\n');
716eed3
 		}
716eed3
+	} else {
8945c4b
+		g_string_append_printf (str, "\n\n%s%s%s%s%s%s",
8945c4b
+		                        "# No nameservers found; try putting DNS servers into your\n",
8945c4b
+		                        "# ifcfg files in /etc/sysconfig/network-scripts like so:\n",
8945c4b
+		                        "#\n",
8945c4b
+		                        "# DNS1=xxx.xxx.xxx.xxx\n",
8945c4b
+		                        "# DNS2=xxx.xxx.xxx.xxx\n",
8945c4b
+		                        "# DOMAIN=lab.foo.com bar.foo.com\n");
716eed3
 	}
9c92e25
 
8945c4b
 	nameservers_str = g_string_free (str, FALSE);