Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Mar 2021 01:49:18 GMT
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 4f5b454509ab - releng/13.0 - MFC: Fix post-start check when unbound.conf has moved.
Message-ID:  <202103240149.12O1nIPN029532@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/13.0 has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=4f5b454509ab4f1b56a2c9456097ba18baff6609

commit 4f5b454509ab4f1b56a2c9456097ba18baff6609
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2021-03-10 14:18:59 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-03-24 01:48:42 +0000

    MFC: Fix post-start check when unbound.conf has moved.
    
    On behalf of:   des
    Reported by:    phk@
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Approved by:    re (cperciva)
    
    (cherry picked from commit 409388cfac49a312034e9397c870e3f81ff90734)
    (cherry picked from commit c6aa83342e5deccc51f627fcb92ca083fe798a3b)
---
 libexec/rc/rc.d/local_unbound | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libexec/rc/rc.d/local_unbound b/libexec/rc/rc.d/local_unbound
index 858ef56dbc0d..19cb9a6c5c01 100755
--- a/libexec/rc/rc.d/local_unbound
+++ b/libexec/rc/rc.d/local_unbound
@@ -106,7 +106,7 @@ local_unbound_poststart()
 	local retry=5
 
 	echo -n "Waiting for nameserver to start..."
-	until "${command}-control" status | grep -q "is running" ; do
+	until "${command}-control" -c "${local_unbound_config}" status | grep -q "is running" ; do
 		if [ $((retry -= 1)) -eq 0 ] ; then
 			echo " giving up"
 			return 1



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