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 bd3569c7760874562de95ef65fbdf71c5ca5bf7b..7c9d857e03ffe56bc21fa642127379b548c758d1 100755 (executable)
--- 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 ea368fc9ef2c0e090bfbbf167d481e83d0e95e50..4dce8486a618cd326f6a3a5ca36bee215f8cd199 100755 (executable)
--- 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