From nobody Fri Mar 24 20:46:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjvPk2Fb7z416dg; Fri, 24 Mar 2023 20:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjvPk1kQkz3MrL; Fri, 24 Mar 2023 20:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679690778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DB545orpdjG82d0RTzs3uV05xjawArbS8C8AakPJQZU=; b=pHMO2e1EdePzS9j/9L1P5nqoSQO7yZYjmy4+MnBZ2T27n7v2wYJVqNPaS2l4s61T4i4e0D tWSLOncDiONaHZL1GMdWre/8VwabYv5kayxLdixzb1tovq1dSWP0xB+1inpFHzDZ3DvI8l gvKTqquYL/9TBRPJyDDbNqL7JX5tt58IXwvEX9NGECG0mZSY1dFiZZSFHwuh0iDAK6PxQH m9QtbAhaVLF1gCqYCSR6eFaSVY+PAl1/HB3xnZMep+ZqC3+TpNiQYlJMoNVQgKFPILyDNb rc46Q0SII7Nkx4d/5ccn+WuX1/wRq+L6mMihpq6PkyZRlps8hZoFdhn2PgHyzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679690778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DB545orpdjG82d0RTzs3uV05xjawArbS8C8AakPJQZU=; b=OqpdsiALeBIw+bweQd8G0T4zn8LhyL8W5m19JYR1rneA4cMkzRsl7nR3a2xs3BHhMM0f1h JHYzdPLuDgZJXSl2KZrgCwK7aJtWXOnkiJcTRMkDhhshqB3Dx/x9Yf9fl8xi1G/s0/G/SX 1Kst7FKxLON4Ak1IgbG3jBcWkksL1kDhUrdqh0eJ0B9gKZdI8enKliasop7XEtJLwdBwfN /5JAB+vkAO7knW9TPYECcnAvYlx/lZbFzIrVDoQSOfyojZtocMacdQuHfRA7rGIc2bVSS4 IL9rIaW41SVdfQ1wqVeTsZ7YgvgayUqGwnNSxuZGMWywjDESEx2JCsL8AQDFIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679690778; a=rsa-sha256; cv=none; b=CoYJdxz5p5RjqhZ7IT/MZ7RB8FTnfSXlgoOTMNmq1qAnK38nKywx90t5fQgBS+GhihUYZP q7+KitCxRSfb0+1sr8p12bHmjrZLrMJ3zngy47T3Pct/3tmXUSte1RQeQ464HRs0t7vtvd GiJRvJ/OZ7yl354blMnLuC382jf/ZFLPMsOiDTnMjQytCF4z3/6kGOIHmlXE8sk53nNPN3 VETe+fwOHD2U8uPcTgmFRSqGKBJuBk0m2Yo17tRNgQqDREir5jnp3eDjUzJfCr/WTur2pS TBSJ2uq42gCrIZK0PXEUp7ccaieBNnf2+5JGNwCXosu9fsLpDxoi6TrnWyPLBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjvPk0pjYzXMk; Fri, 24 Mar 2023 20:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32OKkI7H071262; Fri, 24 Mar 2023 20:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OKkIZO071261; Fri, 24 Mar 2023 20:46:18 GMT (envelope-from git) Date: Fri, 24 Mar 2023 20:46:18 GMT Message-Id: <202303242046.32OKkIZO071261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 9b20ab1e1ef7 - main - local-unbound-setup: Disable the libc subscriber. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b20ab1e1ef7d3de672ec20a62f26a605db8d3d0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9b20ab1e1ef7d3de672ec20a62f26a605db8d3d0 commit 9b20ab1e1ef7d3de672ec20a62f26a605db8d3d0 Author: Dag-Erling Smørgrav AuthorDate: 2023-03-24 20:45:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-03-24 20:46:09 +0000 local-unbound-setup: Disable the libc subscriber. This is the correct way to prevent resolvconf from updating resolv.conf. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D39262 --- usr.sbin/unbound/setup/local-unbound-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/unbound/setup/local-unbound-setup.sh b/usr.sbin/unbound/setup/local-unbound-setup.sh index dc0768a672a6..f725b566b650 100755 --- a/usr.sbin/unbound/setup/local-unbound-setup.sh +++ b/usr.sbin/unbound/setup/local-unbound-setup.sh @@ -195,7 +195,7 @@ do_not_edit() { gen_resolvconf_conf() { local style="$1" do_not_edit - echo "resolv_conf=\"/dev/null\" # prevent updating ${resolv_conf}" + echo "libc=\"NO\"" if [ "${style}" = "dynamic" ] ; then echo "unbound_conf=\"${forward_conf}\"" echo "unbound_pid=\"${pidfile}\""