From nobody Sun Jan 23 22:18:38 2022 X-Original-To: dev-commits-src-all@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 CA5B71972F33; Sun, 23 Jan 2022 22:18:38 +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 4JhnZQ5LDGz4sbD; Sun, 23 Jan 2022 22:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642976318; 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=p/RoZPGQtM+4rCCxpKeyJAlMgtt0kQodOJ58OHUGXHs=; b=mq2oxQwsfn53bwuXcwtWSl63AN+TYT0rEuEd2VtlnvluHXXrQe101xRm50Z97ODMKLACBb /9UJ1PZkNDKFcs3LviCXBciKf/m6gUH2ukx74vsFYklbF87Wv6kEbhpiM1GtQQVLRdUgHC XdZOfShK69s+0kH3mV6bn5ySldoNshQ/UQ/gJ/5G5hC1Q1+tmxYBA7w139E128X6o4MGmz +d5a225z1H78nz9zOgQ0tVhy3CN5mts1N7REU9ijs3tv0E4Cqp0rwPaFqvnB+hcL3O8X24 2OeLiTVd3X1KSrK/ayy2ny/qB9eXoSb92hXn2vCuyrjMRM1REvWYl9frUjaURw== 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 934B2288B; Sun, 23 Jan 2022 22:18:38 +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 20NMIcAI052257; Sun, 23 Jan 2022 22:18:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20NMIcGW052256; Sun, 23 Jan 2022 22:18:38 GMT (envelope-from git) Date: Sun, 23 Jan 2022 22:18:38 GMT Message-Id: <202201232218.20NMIcGW052256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: f72926eab00c - main - mountd: Delay starting mountd until after mountlate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: f72926eab00ccd956298e44831b519daa704a868 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642976318; 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=p/RoZPGQtM+4rCCxpKeyJAlMgtt0kQodOJ58OHUGXHs=; b=mYijRDUG4wqrgFN/BuRhz3lXrynVO8rFIqFZJ3GG4Sn6zbiNPy4Dz6Vr6Zy3xSEV6DpwYv njgkje14YmSAAC0HRrKRuTTkUWEhAJ0q3JfvUUAAf6mYiOo7rGa7JPUj6tCxglB2ln7bxc I5KeWc9FAO5dMwXBhg9NtZVk6Y5HY2C48dX7NNkkaf+VZqsS0pMO1e6MlFwIFhXWMK54FL 8u5Cswhot4lWnLoKfC8sVjVpZYyiKiawYZctR1ZVYbmDNbj5kCFrMYU05ov+MyX8xPAZjA OCLuGoCI8CjwKqqOA1rdXFmzO6w21/99rhCk4AxZScvuFFgAdCJVxrH/wEq7ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642976318; a=rsa-sha256; cv=none; b=XlblP8ksc5EM3FNr/ewvOxFQQQ6rpVt+wLBbref8R3CJIWmeY6dj9bc3r/TMwFmss8z3ZV IqI0qWfI580/dXU/Ntbr4g7DOwa1px25gyW2Wizrx/7eh0TQb/THFcgMMiRoTtzMn13u65 UPL1o9p4MkYU/b5Q5TtzG2reFaxnzp9xqLKd/HFfpSjzignNbwbgxiBFXaTEuBQzo9m1qB Jg5slRzfa6P54ldVI0v69n8xSlVvBxnnmkXOdf8HbI7SWgmUYg+QXyJPirwAekGVumwYB0 et4o4/XCK6L7gynaZjavLrTyFgXDRtIREFXyC/kKIUpVi4qGK9V5qmZFLaAmRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f72926eab00ccd956298e44831b519daa704a868 commit f72926eab00ccd956298e44831b519daa704a868 Author: Rick Macklem AuthorDate: 2022-01-23 22:17:40 +0000 Commit: Rick Macklem CommitDate: 2022-01-23 22:17:40 +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 Differential Revision: https://reviews.freebsd.org/D33256 MFC after: 3 months --- 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