From patchwork Sun May 14 11:54:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Oranje X-Patchwork-Id: 762124 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wQhx35lJsz9s8V for ; Sun, 14 May 2017 21:55:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GFZ8xL5g"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=3uD6i2rwb81j0Q2ZMWj6p4hUzTK43xHXQUTw66JpQ60=; b=GFZ8xL5gDS6vEU t3o7h2iisxr7ZL1UZRBQQhUk6qYs5YZJJRAxpCcvtCaSiVAZnSXiulRomblfym6dhB5mVPFTsniYR NeiGL+rhcYljVdaa5NrdbkjBWcguv1yx7IPjZbXy0sIUS/9khc94Zp5IWeHFhnmYcDXnexKfgN+DW R6k2/XN+S0skn9+oW8nXQZi+Q0yKOPgD/JRERDIBAGxpSG2OLg5by/xIKNEkxRZJ2mVB91kuSaGSj j9Jg2oRTZVwxvbnlQXy3GkNq0E6sg1Be5hCoyjPQMHrOSwk/SJFu1KtMX9/r9eyY9nYukiotQn08S nNDUe+hbfJYtJ8kSFGDA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d9s7F-0006LL-MX; Sun, 14 May 2017 11:55:13 +0000 Received: from lb3-smtp-cloud2.xs4all.net ([194.109.24.29]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d9s7B-00058U-Uq for lede-dev@lists.infradead.org; Sun, 14 May 2017 11:55:11 +0000 Received: from boekje-5.achterlaan ([217.103.48.239]) by smtp-cloud2.xs4all.net with ESMTP id LBui1v00359eMvd01Bumoi; Sun, 14 May 2017 13:54:46 +0200 From: Paul Oranje To: lede-dev@lists.infradead.org Date: Sun, 14 May 2017 13:54:46 +0200 Message-Id: <20170514115446.44525-1-por@xs4all.nl> X-Mailer: git-send-email 2.12.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170514_045510_135017_492651D3 X-CRM114-Status: UNSURE ( 6.06 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [194.109.24.29 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [194.109.24.29 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH v3] dnsmasq: also write /tmp/resolv.conf when UCI dhcp.dnsmasq.noresolv is '1' X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Oranje MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org fixes FS#785 v3: corrected typo (noreolv) v2: also change guard in dnsmasq_stop() routine v1: write /tmp/resolv.conf also when noresolv is true Signed-off-by: Paul Oranje --- 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 --- 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