[LEDE-DEV] [PATCH v2] dnsmasq: also write /tmp/resolv.conf when UCI dhcp.dnsmasq.noresolv is '1'

Bastian Bittorf bb at npl.de
Mon May 15 00:14:24 PDT 2017


* Paul Oranje <por at xs4all.nl> [15.05.2017 09:08]:
> fixes FS#785
> v1: write /tmp/resolv.conf also when nosolv is true
> v2: also change guard in dnsmasq_stop() routine
> 
> Signed-off-by: Paul Oranje <por at xs4all.nl>
> ---
>  package/network/services/dnsmasq/files/dnsmasq.init | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
> index 30fec7a4ee..c7506ed4ea 100644
> --- a/package/network/services/dnsmasq/files/dnsmasq.init
> +++ b/package/network/services/dnsmasq/files/dnsmasq.init
> @@ -947,7 +947,7 @@ dnsmasq_start()
>  	echo >> $CONFIGFILE_TMP
>  	mv -f $CONFIGFILE_TMP $CONFIGFILE
>  
> -	[ "$resolvfile" = "/tmp/resolv.conf.auto" ] && {
> +	[ "$noreolv" -eq '1' -o "$resolvfile" = "/tmp/resolv.conf.auto" ] && {

thanks for the patch!

please test for 'bool_true' not for 1
also: should'nt it be 'noresolv'?

bye, bastian



More information about the Lede-dev mailing list