| 1 |
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
|
| 2 |
--- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 2008-09-15 10:33:29.000000000 -0400
|
| 3 |
+++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c 2008-10-12 08:25:48.000000000 -0400
|
| 4 |
@@ -243,7 +243,7 @@ write_resolv_conf (FILE *f, const char *
|
| 5 |
g_free (tmp_str);
|
| 6 |
}
|
| 7 |
|
| 8 |
- if (nameservers) {
|
| 9 |
+ if (nameservers && g_strv_length (nameservers)) {
|
| 10 |
GString *str;
|
| 11 |
int num;
|
| 12 |
|
| 13 |
@@ -265,6 +265,14 @@ write_resolv_conf (FILE *f, const char *
|
| 14 |
}
|
| 15 |
|
| 16 |
nameservers_str = g_string_free (str, FALSE);
|
| 17 |
+ } else {
|
| 18 |
+ nameservers_str = g_strdup_printf ("\n\n%s%s%s%s%s%s",
|
| 19 |
+ "# No nameservers found; try putting DNS servers into your\n",
|
| 20 |
+ "# ifcfg files in /etc/sysconfig/network-scripts like so:\n",
|
| 21 |
+ "#\n",
|
| 22 |
+ "# DNS1=xxx.xxx.xxx.xxx\n",
|
| 23 |
+ "# DNS2=xxx.xxx.xxx.xxx\n",
|
| 24 |
+ "# DOMAIN=lab.foo.com bar.foo.com\n");
|
| 25 |
}
|
| 26 |
|
| 27 |
if (fprintf (f, "%s%s%s",
|