[package] dnsmasq: only write search directive if domain is actually set
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 10 Jan 2010 15:31:58 +0000 (15:31 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 10 Jan 2010 15:31:58 +0000 (15:31 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19090 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/dnsmasq/files/dnsmasq.init

index 70488a5..7955fdb 100644 (file)
@@ -311,11 +311,11 @@ start() {
 
        /usr/sbin/dnsmasq $args && {
                rm -f /tmp/resolv.conf
 
        /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
                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
        }
 }
 
        }
 }
 
This page took 0.02092 seconds and 4 git commands to generate.