From nobody Sat Apr 23 22:25:30 2022 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 D26981A8194E; Sat, 23 Apr 2022 22:25:30 +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 4Km5Sp5Z6yz3Dt7; Sat, 23 Apr 2022 22:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650752730; 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=U33zOyX9QhqE5YZT+a71I5atiqyZfY/jnr+VgvIMRog=; b=HIRYPewBHyLxwBb2KNedzBIS2j78241ILSoI7431rsd7UAIxdvkXT+OW9u35XH5dAh+1JA EoqE9T2uLZ0g6MCkU0RYXxqTct7hMlHbYGZtY+1vMxK0KCES5O4bbz4xf079O4YWZ08qZe sfR3Cyxp4VeNcqnGWdgELBfzEZYsd+fm9LECbFqDv6rIiQWbWiBobx6gcIX3NaDry0/aoY jdR9hGw7F9gk8lxgMGklznIDqMWGcy5iT4gmufXYDCGxKKDiZAEwZTlHu6S5qn08SgeH8M aBkKPc4sN6IqBctfICXbN21CoOxLpKUhzagJR7tT2mLa2ysstaCnOTSHjEoFjg== 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 9ED4319C77; Sat, 23 Apr 2022 22:25:30 +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 23NMPUGp096923; Sat, 23 Apr 2022 22:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23NMPUwr096922; Sat, 23 Apr 2022 22:25:30 GMT (envelope-from git) Date: Sat, 23 Apr 2022 22:25:30 GMT Message-Id: <202204232225.23NMPUwr096922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 92ecb030d254 - stable/13 - mountd: Delay starting mountd until after mountlate 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 92ecb030d2547a95956b3a6e5240e895ad4eed4e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650752730; 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=U33zOyX9QhqE5YZT+a71I5atiqyZfY/jnr+VgvIMRog=; b=n3+3YFXWQN7p4Ffz0ESW3+F7DOwt6UD2F/gTxPdhWv8GyOb1huqzwjaV4+4vMOfnVGR+Az B6fPNAYsr51GyCBNPhRxDj6XZVgZ1EitINu3baLzCy7NehkIUrAhHU1s0ShjDrpS5t4Esa 05UMf8YjV0y0k7sEDzFNA2BtQ4q5PC64l+26asZ6YQ0N2XpoRkFFZnrmn0WJR7SwBVdyFS vawh76zaUjMsoUJ8F1nAZ3vQxZFoo9h24e5UOe+8Ogf4WOSdF6Ab6l/fJbM9G65n3DpAt+ bYrAJ/iwCPyvhN0rCq2XFgjEwVW3Doe1ze7PCWTpJpN78XunjiNNDwi2ChDnPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650752730; a=rsa-sha256; cv=none; b=DObLyeK/YBVot/du4NSyueFwWUX9CC7C1OSGeCgAU4gX+fVuPQmfBP0TW6mGPd5hQUga/F oYB49pHHIKrr7yrcXxkQ3ruyxDWBjqo1F0f6IF7O0l0uEpa0q0rSs0oA8pdCuFYc7Tl68c HOXe+alC1rMyrh8QQOlwGztDcG97DRez6JB7tztxU1vc5AcqetHVcY8xmfPLFgz70rlEQ5 96WA5p0XlHxqalPc7/zT18ytxydl/g9Et2dWqiED84kZBhI5ov2bqVcRIlLxBhhGYAU2fx bGuZEnADyqaesI+q0VqfQOgisPnxq2cWUkK2BwOEs9q22jmriJIYRrgfUpZ+yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=92ecb030d2547a95956b3a6e5240e895ad4eed4e commit 92ecb030d2547a95956b3a6e5240e895ad4eed4e Author: Rick Macklem AuthorDate: 2022-01-23 22:17:40 +0000 Commit: Rick Macklem CommitDate: 2022-04-23 22:21:45 +0000 mountd: Delay starting mountd until after mountlate PR#254282 reports a problem where nullfs mounts cannot be exported via mountd for FreeBSD 13.0. The problem seems to be that, to do the nullfs mounts in /etc/fstab, they require the "late" mount option, so that the underlying filesystem is mounted (ZFS for the PR). Adding "mountlate" to the REQUIRE list in /etc/rc.d/mountd fixes the problem, but that results in a dependency cycle because /etc/rc.d/lockd specifies: REQUIRE: nfsd BEFORE: DAEMON --> which forces mountd to preceed DAEMON. This patch removes "nfsd" from REQUIRE for lockd and statd, then adds mountlate to REQUIRE for mountd, to fix this problem. Having lockd REQUIRE nfsd was done in the NetBSD code when it was pulled into FreeBSD and there does not seem to be a need for this. In case this causes problems, a long MFC has been specified. PR: 254282 (cherry picked from commit f72926eab00ccd956298e44831b519daa704a868) --- libexec/rc/rc.d/lockd | 2 +- libexec/rc/rc.d/mountd | 2 +- libexec/rc/rc.d/statd | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/lockd b/libexec/rc/rc.d/lockd index 565ba35164eb..894b3c136690 100755 --- a/libexec/rc/rc.d/lockd +++ b/libexec/rc/rc.d/lockd @@ -5,7 +5,7 @@ # # PROVIDE: lockd -# REQUIRE: nfsclient nfsd rpcbind statd +# REQUIRE: nfsclient rpcbind statd # BEFORE: DAEMON # KEYWORD: nojail shutdown diff --git a/libexec/rc/rc.d/mountd b/libexec/rc/rc.d/mountd index ba573ad732cc..0c6e75f07d64 100755 --- a/libexec/rc/rc.d/mountd +++ b/libexec/rc/rc.d/mountd @@ -4,7 +4,7 @@ # # PROVIDE: mountd -# REQUIRE: NETWORKING rpcbind quota +# REQUIRE: NETWORKING rpcbind quota mountlate # KEYWORD: nojail shutdown . /etc/rc.subr diff --git a/libexec/rc/rc.d/statd b/libexec/rc/rc.d/statd index 2ff8d45ffde9..e1150c67a16f 100755 --- a/libexec/rc/rc.d/statd +++ b/libexec/rc/rc.d/statd @@ -5,7 +5,7 @@ # # PROVIDE: statd -# REQUIRE: nfsclient nfsd rpcbind +# REQUIRE: nfsclient rpcbind # BEFORE: DAEMON # KEYWORD: nojail shutdown