From owner-dev-commits-src-all@freebsd.org Wed Mar 24 00:56:57 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9AC5457BB29; Wed, 24 Mar 2021 00:56:57 +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 4F4qZK3zz8z4lGG; Wed, 24 Mar 2021 00:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7BB9F2D5E; Wed, 24 Mar 2021 00:56:57 +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 12O0uvVe058230; Wed, 24 Mar 2021 00:56:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12O0uvnj058229; Wed, 24 Mar 2021 00:56:57 GMT (envelope-from git) Date: Wed, 24 Mar 2021 00:56:57 GMT Message-Id: <202103240056.12O0uvnj058229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: c6aa83342e5d - stable/13 - MFC: Fix post-start check when unbound.conf has moved. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c6aa83342e5deccc51f627fcb92ca083fe798a3b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2021 00:56:57 -0000 The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=c6aa83342e5deccc51f627fcb92ca083fe798a3b commit c6aa83342e5deccc51f627fcb92ca083fe798a3b Author: Dag-Erling Smørgrav AuthorDate: 2021-03-10 14:18:59 +0000 Commit: Glen Barber CommitDate: 2021-03-24 00:56:33 +0000 MFC: Fix post-start check when unbound.conf has moved. On behalf of: des Reported by: phk@ Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 409388cfac49a312034e9397c870e3f81ff90734) --- 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