From nobody Wed Jun 14 12:41:30 2023 X-Original-To: dev-commits-src-branches@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 4Qh4mW23vSz4dXNx; Wed, 14 Jun 2023 12:41:31 +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 4Qh4mW1SGLz3ndd; Wed, 14 Jun 2023 12:41:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686746491; 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=xZBO8OzCeULhrRzMQLyp4c3vQzQR6bJ6Sdpf34cOJlU=; b=gHujkhGGmRHz4nSE2saLLycHmNBsS2JwzNsSXoGyXuX1u/qBpT+DARnwFyXWEnAXZyzP80 xU8H7zvnR+2mxkYt2vnKJnpPZK5cKjOiLplNHXgmf31S7kY65l6j+Ov01Lzpk9oAvFBiJ1 Cd+VagVnPB8t0chKVC6LorzHMyf3ex1+/Dd6Bq3a0EuEUOAIHVpA80+dwNjdtOhEIIr+Cb dwocLlVVIJee1kQunDjjduPWe7dWWxRbHBjivNGow4K2neqyQ/b9vy63KjMt0oHuaMCHtO tDzfaZndjzoQc++VYRC4wv+vC87IP9Mfustg2036f+yXdYARKRl5TzhUfPLvmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686746491; 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=xZBO8OzCeULhrRzMQLyp4c3vQzQR6bJ6Sdpf34cOJlU=; b=qcTjzXbYfQ4DeK4HBi5eunT8Ymz0ELpyXp6jHbccse9IcavFs6B0y+/N1BSv2Nzb7WVOPD AfrhCy1/KFw+mhXJeSNBncP40LKk9a6XrIMkm21pC4vR7mn8XDaWURXGnKosf9xDp7z9CV haZFGeCsG340uEFdaDCdNZeigMDHVPQAh73S1vzuzkOcwt/x0CDfP7G6JdJJMyG2N6RLXH ZihmPcNNnMcseoaXoRnFwJ31HuseNzSoh0zj8AJ5NwoN3oDyqvjWawVtOTpmtVG5/h0MhW CgoLdDGJ3a0WH9FtCDQTlR95bzk7lZeEZe43jkSWn5kbj0XJsmIOm0rP+Fp3KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686746491; a=rsa-sha256; cv=none; b=wcHLUkdV9lMgTsvwPlOakOxw+tem7S4YNYo0JO9D+YsoruEG31teWk3T35YJoAwN3mH8xZ kxCejMZa3COeurPSaiC3huKWL82n3DqEs+nuD79L9OlGTybA80pvChchBXUw/1HMdHwWYz ZE0ilCNaC1yPDTy+PslDaQ+nbuhPYGJIv85Mp+Q5I+JZ4e3l2IgHRqPMSKQun1xZFwqaR1 Xf+R50qyKU+RfReMM/Icv4MLb8x3zcbVKtb82jkP/dZa8eTRcWladOvZ7UT0sU4uT1qfBZ TIttFLJs7YSz9wkhnzSpSyze+Z47n8b4/yIVE9JSJzk/ObxCXNKLgOLOBK5ZiQ== 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 4Qh4mW0Vv2z13qX; Wed, 14 Jun 2023 12:41:31 +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 35ECfUdi026290; Wed, 14 Jun 2023 12:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35ECfUjj026289; Wed, 14 Jun 2023 12:41:30 GMT (envelope-from git) Date: Wed, 14 Jun 2023 12:41:30 GMT Message-Id: <202306141241.35ECfUjj026289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 9feaa109e4ae - stable/13 - local-unbound-setup: Disable the libc subscriber. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9feaa109e4ae28903ca9247ed6cbf721bc580150 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9feaa109e4ae28903ca9247ed6cbf721bc580150 commit 9feaa109e4ae28903ca9247ed6cbf721bc580150 Author: Dag-Erling Smørgrav AuthorDate: 2023-03-24 20:45:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-06-14 12:40:39 +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 (cherry picked from commit 9b20ab1e1ef7d3de672ec20a62f26a605db8d3d0) --- 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}\""