From patchwork Sat Feb 23 02:17:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1047248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hHtyv1J6"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uy5XV7RQ"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 445sM214dNz9sBL for ; Sat, 23 Feb 2019 13:18:18 +1100 (AEDT) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6R0wuTF/Hw0NQ6JZEvcH+dCK4FewySm6JILfBXyddpo=; b=hHtyv1J6aierHk 37Kx35inuMSiUaWvxb/+EaWk2xy85asCxO3wkve4En1XrabNX83851bdvhY0uid8WTnR0vlgIsHwY EOUYT8uHjOKJgkpqzJZBT76vQbhYV5lTOwrySuxBvIa7Suu2WjnU31AwOdMAPNJkBOF5Y4qojITRe IQFHaFKRLPdEfuCZag+454Y8+3rle2MDjxO79mpgM6pBgN3Y+VoDvZ+dXfJneM1a2gVXwbwTifOOM lafTuLxZFJo+vjg/l9aiNaBG9q8Zsq/a/hTYJddWQPE2XYwJ7L2q4S0+j+auEyU49RdiM1Ook70V2 SR0HkgWq3BRKRK42DzFQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gxMt9-0006jR-D6; Sat, 23 Feb 2019 02:18:03 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gxMt1-0006aY-VG for openwrt-devel@lists.openwrt.org; Sat, 23 Feb 2019 02:17:58 +0000 Received: by mail-pf1-x443.google.com with SMTP id n22so1913980pfa.3 for ; Fri, 22 Feb 2019 18:17:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Er+xfhraHnI3FCUk3Elz5rYlkbjGXRjtlqzlkhboYZU=; b=uy5XV7RQ0w9Xkp0Zj/nSH4svwfN8xj4WWImJhBnan2jWMcrvsW0NLs7at3f76R59Pi 9qIruCiOsrrNMANcoBtDg6T8PT59sxV+cC/lq5sQEO54mC8mIcIurZh7baqDMGzl2zGz xmrXufcw1BX/EI2fo4w/x6fZn3fxoXD4qmMv2mEx1R1i55I/2iAL2u/fuJi7p4Hy57dz yXwBUcQpXS+yIl87qi7536gsNmZctRLlZwM9ZaCBCQUJX6g6p6WvIdgMT3NWzkLWMMQi mPZcUqfTwLf2U7VZhsFfq/62A70l+HPeWWa8K1eU9jMAw5cJz9i3NLjSRQZ71brWLPKW wV2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Er+xfhraHnI3FCUk3Elz5rYlkbjGXRjtlqzlkhboYZU=; b=XGxz0yMCjt/NtyivMBzNOSWIfePX3RuZgvtXZv5RNGwzvM53kizRc56TnXw1lIwwjz psFLXQPgl/XcAzPL7bg1war5S/VzMTXWmoLTFCofYYLJOqY0Z1BliJ3NyX9u4tz9SzFc W8BudQtBff4AJBI/rEVC3vkDhLVcdX0hdRWwKRSuY/1UXdWzQ+VxiFYVICbfeFNI78ul WwPO8Xv+I0AaM2JSI6HOEVe35CaFgcOiDhrtw4DeQ5JjIheqFZhdZU4S8xO0tUtqAiF+ cLSrNnyErNnZNwVj/OdPgpPEtsR6LMH5OvfwYBvRLnJCr/9EiSgzLh0JVvd2C2pbQl33 Vi5A== X-Gm-Message-State: AHQUAuaUMcsb188GUTVg/FuV2LMRFrc/4GWjFJVhK0OZ8iGDWHDI6FKI TkJ1PVHxMku5U42GbNDBmoM= X-Google-Smtp-Source: AHgI3IZb/txTbVWtocpMk+5uLEQq5BIs4Cb5QID8rhSrQj3D/oMcCNNAaD/VkK18OLc6AlpAEWEAaQ== X-Received: by 2002:a62:ed15:: with SMTP id u21mr7318974pfh.38.1550888275522; Fri, 22 Feb 2019 18:17:55 -0800 (PST) Received: from titan.localdomain.hq.cloud.yunionyun.com ([47.52.22.109]) by smtp.gmail.com with ESMTPSA id y22sm2577541pfn.136.2019.02.22.18.17.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 18:17:54 -0800 (PST) From: Yousong Zhou To: dedeckeh@gmail.com Date: Sat, 23 Feb 2019 02:17:31 +0000 Message-Id: <20190223021732.7210-2-yszhou4tech@gmail.com> In-Reply-To: <20190223021732.7210-1-yszhou4tech@gmail.com> References: <20190223021732.7210-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190222_181756_143049_5FA3B8A9 X-CRM114-Status: UNSURE ( 8.87 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:443 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (yszhou4tech[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [OpenWrt-Devel] [PATCH 18.06 2/2] dnsmasq: prefer localuse over resolvfile guesswork X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: por@oranjevos.nl, Yousong Zhou , openwrt-devel@lists.openwrt.org, ldir@darbyshire-bryant.me.uk Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This makes it clear that localuse when explicitly specified in the config will have its final say on whether or not the initscript should touch /etc/resolv.conf, no matter whatever the result of previous guesswork would be (cherry picked from c17a68cc61a0f8a28e19c7f60b24beaf1a1a402d) Signed-off-by: Yousong Zhou Acked-by: Hans Dedecker Tested-by: Paul Oranje --- package/network/services/dnsmasq/Makefile | 2 +- package/network/services/dnsmasq/files/dnsmasq.init | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index c50717d091..eff9cfea24 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.80 -PKG_RELEASE:=1.3 +PKG_RELEASE:=1.4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index b119981cb8..33ef98ce56 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -733,7 +733,7 @@ dnsmasq_start() { local cfg="$1" local disabled user_dhcpscript - local resolvfile localuse + local resolvfile localuse=0 config_get_bool disabled "$cfg" disabled 0 [ "$disabled" -gt 0 ] && return 0 @@ -883,13 +883,13 @@ dnsmasq_start() config_get_bool cachelocal "$cfg" cachelocal 1 config_get_bool noresolv "$cfg" noresolv 0 - config_get_bool localuse "$cfg" localuse 0 if [ "$noresolv" != "1" ]; then config_get resolvfile "$cfg" resolvfile /tmp/resolv.conf.auto [ -n "$resolvfile" -a ! -e "$resolvfile" ] && touch "$resolvfile" xappend "--resolv-file=$resolvfile" [ "$resolvfile" = "/tmp/resolv.conf.auto" ] && localuse=1 fi + config_get_bool localuse "$cfg" localuse "$localuse" config_get hostsfile "$cfg" dhcphostsfile [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile" @@ -1039,13 +1039,13 @@ dnsmasq_start() dnsmasq_stop() { local cfg="$1" - local noresolv resolvfile localuse + local noresolv resolvfile localuse=0 config_get_bool noresolv "$cfg" noresolv 0 - config_get_bool localuse "$cfg" localuse 0 config_get resolvfile "$cfg" "resolvfile" [ "$noresolv" = 0 -a "$resolvfile" = "/tmp/resolv.conf.auto" ] && localuse=1 + config_get_bool localuse "$cfg" localuse "$localuse" [ "$localuse" -gt 0 ] && ln -sf "/tmp/resolv.conf.auto" /tmp/resolv.conf rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp