From nobody Fri Jun 13 15:48:52 2025 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 4bJkMm56Mhz5xbb8; Fri, 13 Jun 2025 15:48:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJkMm4RrZz3dSN; Fri, 13 Jun 2025 15:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749829732; 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=QTCXK3eRwQfaHTPgNz3ivTcIReEa/1DhJyjIt4PusyQ=; b=nUuONgOTEWmbYz2eC+mxNcnZr8C0aUsAcoLmy//Cxq8ZzSFrWqd9ds2Tg9tKRwDOG1BhOb Bf06xmTazGF/vUdhH5OADeg5d/rbnTEwgVThDwzr3uWuzL44lJ07Nbmid2MmER6dw5hZsW wo+oGbX72CxSTjhMhBHWtuMcpukHCq4zjKiu4oDMMfLCy24kaMkr4HYKKK9D+lL/aGv7tJ Y5AQdcx28mCvPkUbqnPY8KhOafbx69tYrfvnHvrBBgknWyCWrJSQuPOe6Z7MSsUwRDHmIH NQPRXax71+Jqqg6wyc8vtXdrBNVD8Agt3XnHqXIaYt0+/qxmH/aOEsJi25QwYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749829732; 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=QTCXK3eRwQfaHTPgNz3ivTcIReEa/1DhJyjIt4PusyQ=; b=s/hgV00Y4t4D0dpijco7ek4NoXBFurZ+xg1SrdyoaOkn09FG9qHBCBAo2ETE7NKXZXgAxI eqc6utO017eFzeopTUx6qznjnFtVtSiV5ME7MUsOzL7PXwomPbBdRVOEyGAdSGne2FPZGA A0LxdaEdw4xWcxGOVbXIqB2lZXdEBSzrTLFM8Adw53QPeETzueqWvFOtm2jiv/c2uSn2GU uUbK5P3Hr6m4JGgc+ItP8022XrTnd+QjKuDPv3xLORg1ovenmWZyW83f54T2LUKdKYHdMS pEQPHQ8lY8Ikv4Mrcd7+WrGbylNmxaneE9Le3H9C9A5Wayzer4uvCYEZqbUGcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749829732; a=rsa-sha256; cv=none; b=FHMkgA6z759vlds3BBcqjFaWre1Q/QERFL3W0kQ+tBXq2gAThA/2WjmjcSP5qS1644nDr0 5QMyBfW6NrweRNSSsGTyziJwJPTvXm351Qn0Id70A+4AA8H50PdDW54hlA2fpm+O7DwFGr 5Dm7M0xTHJcPeOeFiu/tI94/RAmCZhcOTLXjautkfvonD/1+F3JWQ9oEykj7+L+pUFVgCC DeTY/gVZdupTChdTgxt5DKlqK6OpqW2XwEDzyGTN6yqcgoHWltoTUUq15D2+mIm+B/LKge jaLI+TTV0Q8F3aGf/WxKRPHWKGMdZEwi7Y++inLgvMLu00EqLTcywPSvJolF1g== 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 4bJkMm3Z1gz13ly; Fri, 13 Jun 2025 15:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55DFmqJV004630; Fri, 13 Jun 2025 15:48:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55DFmqnu004627; Fri, 13 Jun 2025 15:48:52 GMT (envelope-from git) Date: Fri, 13 Jun 2025 15:48:52 GMT Message-Id: <202506131548.55DFmqnu004627@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 900bc0206348 - main - rc.d/zpool: change mountcritlocal dep from BEFORE to REQUIRE 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 900bc0206348a439b3a0625a7239cb87a2dc27c5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=900bc0206348a439b3a0625a7239cb87a2dc27c5 commit 900bc0206348a439b3a0625a7239cb87a2dc27c5 Author: Siva Mahadevan AuthorDate: 2025-03-14 15:52:12 +0000 Commit: Warner Losh CommitDate: 2025-06-13 15:47:25 +0000 rc.d/zpool: change mountcritlocal dep from BEFORE to REQUIRE In cases where the `/boot` directory is mounted from a different disk, `/boot/zfs/zpool.cache` will not be found during a `rc.d/zpool` run. This is because `/etc/fstab` mounts are mounted in `rc.d/mountcritlocal`, which currently runs AFTER (i.e. `REQUIRE:`) `rc.d/zpool`. This change swaps the `rcorder` of `rc.d/zpool`'s dependency on `mountcritlocal` from `BEFORE:` to `REQUIRE:`. This will ensure that `/boot` (or even `/etc/` in some configurations) to be visible while searching for `zpool.cache`. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1614 Closes: https://github.com/freebsd/freebsd-src/pull/1614 --- libexec/rc/rc.d/zpool | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/zpool b/libexec/rc/rc.d/zpool index 94e107bd9ae0..63f040ad122b 100755 --- a/libexec/rc/rc.d/zpool +++ b/libexec/rc/rc.d/zpool @@ -3,8 +3,7 @@ # # PROVIDE: zpool -# REQUIRE: hostid disks -# BEFORE: mountcritlocal +# REQUIRE: hostid disks mountcritlocal # KEYWORD: nojail . /etc/rc.subr