[FS#1446] dnsmasq init script may add a resolvfile argument when noresolv is requested.

[LEDE Bugs]

Nice catch.
Patches though must be submitted inline or as a pull request, please see https://openwrt.org/submitting-patches.


> Op 20 mrt. 2018, om 01:12 heeft LEDE Bugs <lede-bugs at lists.infradead.org> het volgende geschreven:
> 
> A new Flyspray task has been opened.  Details are below. 
> 
> User who did this - Phil (philsauce) 
> 
> Attached to Project - OpenWrt/LEDE Project
> Summary - dnsmasq init script may add a resolvfile argument when noresolv is requested.
> Task Type - Bug Report
> Category - Base system
> Status - Unconfirmed
> Assigned To - 
> Operating System - All
> Severity - Low
> Priority - Very Low
> Reported Version - Trunk
> Due in Version - Undecided
> Due Date - Undecided
> Details - Using OpenWrt trunk.
> 
> For a dhcp UCI file with multiple dnsmasq sections, if the first section has the noresolv option set, and a following section contains a resolvfile option, running the dnsmasq init script with the restart argument results in the resolvfile being added to both configuration files.
> 
> EG, with the config file:
> 
> config dnsmasq 'foo'
> 	option noresolv 1
> 
> config dnsmasq 'bar'
> 	option resolvfile '/tmp/resolv.bar.conf'
> 
> 
> After running:
> /etc/init.d/dnsmasq restart
> 
> The content of /var/etc/dnsmasq.conf.foo is:
> 
> # auto-generated config file from /etc/config/dhcp
> conf-file=/etc/dnsmasq.conf
> no-resolv
> bind-dynamic
> dhcp-leasefile=/tmp/dhcp.leases
> resolv-file=/tmp/resolv.bar.conf
> stop-dns-rebind
> dhcp-broadcast=tag:needs-broadcast
> addn-hosts=/tmp/hosts
> conf-dir=/tmp/dnsmasq.d
> 
> 
> 
> 
> bogus-priv
> conf-file=/usr/share/dnsmasq/rfc6761.conf
> 
> 
> This doesn't happen if the init script is given the start or reload argument.
> 
> The attached patch fixes the issue for me.
> 
> One or more files have been attached.
> 
> More information can be found at the following URL:
> https://bugs.openwrt.org/index.php?do=details&task_id=1446
> 
> _______________________________________________
> lede-bugs mailing list
> lede-bugs at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-bugs