Просмотр исходного кода

dnsmasq: only write search directive if domain is actually set

SVN-Revision: 19090
Jo-Philipp Wich 16 лет назад
Родитель
Сommit
f40e9e8d8a
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      package/dnsmasq/files/dnsmasq.init

+ 1 - 1
package/dnsmasq/files/dnsmasq.init

@@ -311,11 +311,11 @@ start() {
 
 
 	/usr/sbin/dnsmasq $args && {
 	/usr/sbin/dnsmasq $args && {
 		rm -f /tmp/resolv.conf
 		rm -f /tmp/resolv.conf
+		[ -n "$DOMAIN" ] && echo "search $DOMAIN" >> /tmp/resolv.conf
 		DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
 		DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
 		for DNS_SERVER in $DNS_SERVERS ; do
 		for DNS_SERVER in $DNS_SERVERS ; do
 			echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
 			echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
 		done
 		done
-		echo "search $DOMAIN" >> /tmp/resolv.conf
 	}
 	}
 }
 }