| Message ID | 20170514124628.44814-1-por@xs4all.nl |
|---|---|
| State | Superseded |
| Delegated to: | Mathias Kresin |
| Headers | show |
On 05/14/2017 02:46 PM, Paul Oranje wrote: > fixes FS#785 > --- > > v4: place patch version info in annotation (not in commit message, afraid this is learning by practice) > v3: corrected typo (noreolv) > v2: also change guard in dnsmasq_stop() routine > v1: write /tmp/resolv.conf also when noresolv is true > > > 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..197aae9de1 100644 > You removed also the "signed off by", please re-add it.
On 14/05/17 17:48, Alberto Bursi wrote: > > > On 05/14/2017 02:46 PM, Paul Oranje wrote: >> fixes FS#785 >> --- >> >> v4: place patch version info in annotation (not in commit message, afraid this is learning by practice) >> v3: corrected typo (noreolv) >> v2: also change guard in dnsmasq_stop() routine >> v1: write /tmp/resolv.conf also when noresolv is true Having seen so many versions go by...the overriding questions for me are 1) Why do we want this? 2) Has any of it actually been tested?
ad. 1) FS785 describes why, please have a look there. ad. 2) the patched code has been tested. Producing the submission of the patch for this trivial and simple change has provided me with the opportunity to make almost every error imaginable, and as you have noticed, I greatly succeeded at doing just that. The spam is an unwanted side effect. I’ve submitted a last version of this patch, s.y. Paul > Op 14 mei 2017, om 18:54 heeft Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> het volgende geschreven: > > > > On 14/05/17 17:48, Alberto Bursi wrote: >> >> >> On 05/14/2017 02:46 PM, Paul Oranje wrote: >>> fixes FS#785 >>> --- >>> >>> v4: place patch version info in annotation (not in commit message, afraid this is learning by practice) >>> v3: corrected typo (noreolv) >>> v2: also change guard in dnsmasq_stop() routine >>> v1: write /tmp/resolv.conf also when noresolv is true > > Having seen so many versions go by...the overriding questions for me are > > 1) Why do we want this? > 2) Has any of it actually been tested? > > _______________________________________________ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 30fec7a4ee..197aae9de1 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" ] && { + [ "$noresolv" = "1" -o "$resolvfile" = "/tmp/resolv.conf.auto" ] && { rm -f /tmp/resolv.conf [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && { echo "search $DOMAIN" >> /tmp/resolv.conf @@ -982,7 +982,7 @@ dnsmasq_stop() config_get resolvfile "$cfg" "resolvfile" #relink /tmp/resolve.conf only for main instance - [ "$resolvfile" = "/tmp/resolv.conf.auto" ] && { + [ "$noresolv" = "1" -o "$resolvfile" = "/tmp/resolv.conf.auto" ] && { [ -f /tmp/resolv.conf ] && { rm -f /tmp/resolv.conf ln -s "$resolvfile" /tmp/resolv.conf