Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Jun 2023 12:41:30 GMT
From:      =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 9feaa109e4ae - stable/13 - local-unbound-setup: Disable the libc subscriber.
Message-ID:  <202306141241.35ECfUjj026289@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <des@FreeBSD.org>
AuthorDate: 2023-03-24 20:45:24 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
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}\""



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306141241.35ECfUjj026289>