From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 13 Jan 2014 12:38:53 +0000 (+0100)
Subject: examples/udhcp: do not rewrite resolv.conf if no DNS servers. Closes 6788
X-Git-Tag: 1_23_0~217
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2e66daca654d130b820a4f0498de7f0ec355039a;p=oweals%2Fbusybox.git

examples/udhcp: do not rewrite resolv.conf if no DNS servers. Closes 6788

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/examples/udhcp/sample.bound b/examples/udhcp/sample.bound
index bd3569c77..7c9d857e0 100755
--- a/examples/udhcp/sample.bound
+++ b/examples/udhcp/sample.bound
@@ -22,10 +22,14 @@ then
 	done
 fi
 
-echo -n > $RESOLV_CONF
-[ -n "$domain" ] && echo domain $domain >> $RESOLV_CONF
-for i in $dns
-do
-	echo adding dns $i
-	echo nameserver $i >> $RESOLV_CONF
-done
+# Only replace resolv.conf is we have at least one DNS server
+if [ -n "$dns" ]
+then
+	echo -n > $RESOLV_CONF
+	[ -n "$domain" ] && echo domain $domain >> $RESOLV_CONF
+	for i in $dns
+	do
+		echo adding dns $i
+		echo nameserver $i >> $RESOLV_CONF
+	done
+fi
diff --git a/examples/udhcp/sample.renew b/examples/udhcp/sample.renew
index ea368fc9e..4dce8486a 100755
--- a/examples/udhcp/sample.renew
+++ b/examples/udhcp/sample.renew
@@ -22,10 +22,14 @@ then
 	done
 fi
 
-echo -n > $RESOLV_CONF
-[ -n "$domain" ] && echo domain $domain >> $RESOLV_CONF
-for i in $dns
-do
-	echo adding dns $i
-	echo nameserver $i >> $RESOLV_CONF
-done
+# Only replace resolv.conf is we have at least one DNS server
+if [ -n "$dns" ]
+then
+	echo -n > $RESOLV_CONF
+	[ -n "$domain" ] && echo domain $domain >> $RESOLV_CONF
+	for i in $dns
+	do
+		echo adding dns $i
+		echo nameserver $i >> $RESOLV_CONF
+	done
+fi