From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 10 Jan 2010 15:31:58 +0000 (+0000)
Subject: [package] dnsmasq: only write search directive if domain is actually set
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/06c76b210207360e8d332063224251606639f8b6?ds=sidebyside

[package] dnsmasq: only write search directive if domain is actually set


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19090 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 70488a569..7955fdb0e 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -311,11 +311,11 @@ start() {
 
 	/usr/sbin/dnsmasq $args && {
 		rm -f /tmp/resolv.conf
+		[ -n "$DOMAIN" ] && echo "search $DOMAIN" >> /tmp/resolv.conf
 		DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
 		for DNS_SERVER in $DNS_SERVERS ; do
 			echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
 		done
-		echo "search $DOMAIN" >> /tmp/resolv.conf
 	}
 }