aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-01-10 15:31:58 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-01-10 15:31:58 +0000
commit1aa812b8448aecf782b04db7bbb3103c4b034569 (patch)
tree6da44913f87e521ff95c3ae4b4e16fd3fda1385d
parentdd4942818f14e2f63ec06691ccca9dad2627d779 (diff)
downloadupstream-1aa812b8448aecf782b04db7bbb3103c4b034569.tar.gz
upstream-1aa812b8448aecf782b04db7bbb3103c4b034569.tar.bz2
upstream-1aa812b8448aecf782b04db7bbb3103c4b034569.zip
[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
-rw-r--r--package/dnsmasq/files/dnsmasq.init2
1 files changed, 1 insertions, 1 deletions
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
}
}