From: Jo-Philipp Wich <jow@openwrt.org>
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: http://git.openwrt.org/?a=commitdiff_plain;h=6b44d2ec70760e88efd30cd2110382b7a3e954b2;p=openwrt%2Fsvn-archive%2Farchive.git

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


SVN-Revision: 19090
---

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 70488a569f..7955fdb0ec 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
 	}
 }