projects
/
openwrt
/
staging
/
adrian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46783f8
)
dnsmasq: only write search directive if domain is actually set
author
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 10 Jan 2010 15:31:58 +0000
(15:31 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 10 Jan 2010 15:31:58 +0000
(15:31 +0000)
SVN-Revision: 19090
package/dnsmasq/files/dnsmasq.init
patch
|
blob
|
history
diff --git
a/package/dnsmasq/files/dnsmasq.init
b/package/dnsmasq/files/dnsmasq.init
index 70488a569fe67e24ad31ff369cd4dacd11bc83a1..7955fdb0ecb85245b329eec7d913f1a105b95fd5 100644
(file)
--- 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
}
}