From nobody Wed Oct 15 19:49:11 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 4cn1qq5ZsQz6CtYM; Wed, 15 Oct 2025 19:49:11 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cn1qq33cfz4NLs; Wed, 15 Oct 2025 19:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760557751; 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=0iq/0lfyFR/jXF+FUvLSv+W34MexRHrBC0n6cFRM7ak=; b=ntkZsExV47NCNwB/I8OVL0kG/41QS9k7J5AbzckgPXZ5g95/PY+O1d0JXNf607k645C0QR Pu6vkSz/f75CYtWd3DIX3uPphJk1nNF2HtArB1dqMawNqP0wBePHuSKR3JrRHxvnEo+a4Q S3QL+RFl8PTQjHBKFQ6gYG4Nsp3SQ/6d1x8F/NmOVrThxyY8PbIsbPz5T9UTY3Iae32e+n pFcXHMiQRBx15kMgQIDzEDTBfXFPqJV7dp2c37AlMppyh4GWY48bzEPQek2xNsWpU1Tg89 3sJWL+3arFpybgmu+HU8Lsr7Xqq0KCaXcxkjwzblVqxYezPd5UTPJ/lX0F8ZlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760557751; 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=0iq/0lfyFR/jXF+FUvLSv+W34MexRHrBC0n6cFRM7ak=; b=cckAJYh/0f0sb7yQSpUzfS5nzGp5q5qI8/jQ6+cLj21Xt5hUtxgvYgfv+3VK3nMdRPLyNL KfITlMNzm4/ITnrJSEh3a9SUbtZTEJRQhVnNB2mmjgZuq2NcAAhIrFRV4jb+w7zSCEV5CM yfqGQQpZhhDk7zf5J9C6ItRD3+G/5VX2bdFUrWSojilKd/kDXUUkGLyEYSuihn1iRXFCBq y5pjSo73OXlDkajjoVUgjPVxXeY4XFDDds8cG6wx1fAuxIfIE0amIZa+RkciAHzJd7ugqp bOpZAKESWEFgNQbwjlW3oL9Bk5hYt8aT7HGtJActkgA5c6ctgu3dDEg7zr34fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760557751; a=rsa-sha256; cv=none; b=bhkpimQoBTcQVpHZlAcNDYfBN37ejkpWsqzE9rQxAPeUwfgt7I/evW//P+N3pltNB/rWSy +kq0+NeEf0L/VbI3oPyweHmyILBJjP6AsHBkVc0QiSqBzy+Kn9SeP7mxNCB98qpwMRJarT 7cQr7zNI+djf6ivAYbHL1BglDqRJNQ2xYXXX8KFp82u+NaDqxA6ag1UgX+zz02uyouJWqF dsMqs8ovzNNPZP4zVThPkN/s4JXANnY885itGEb0Z1jFCwm7GRC/QoveTMkYs/H1nOXPSU l2DYVSZXd4YT1XL8dUA8n69gyU+2sszMGg4avCEfjfBjfLVAnAyrkEosEvSTAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cn1qq2D26zsVw; Wed, 15 Oct 2025 19:49:11 +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 59FJnBtX069624; Wed, 15 Oct 2025 19:49:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FJnBrJ069621; Wed, 15 Oct 2025 19:49:11 GMT (envelope-from git) Date: Wed, 15 Oct 2025 19:49:11 GMT Message-Id: <202510151949.59FJnBrJ069621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 24546cb506a0 - releng/15.0 - rc: Update dependencies for zpool scripts 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 24546cb506a0b54b548dd2cf1dfe1e7e029ec146 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=24546cb506a0b54b548dd2cf1dfe1e7e029ec146 commit 24546cb506a0b54b548dd2cf1dfe1e7e029ec146 Author: Mark Johnston AuthorDate: 2025-10-08 12:50:54 +0000 Commit: Colin Percival CommitDate: 2025-10-15 19:23:44 +0000 rc: Update dependencies for zpool scripts After commit 900bc0206348, zpool depends on mountcritlocal. zpoolreguid and zpoolupgrade depend on zpool and want to run before mountcritcycle, so we have a pair of cycles. Update zpoolreguid and zpoolupgrade to avoid this. Approved by: re (cperciva) Reviewed by: des MFC after: 3 days Fixes: 900bc0206348 ("rc.d/zpool: change mountcritlocal dep from BEFORE to REQUIRE") Differential Revision: https://reviews.freebsd.org/D52953 (cherry picked from commit ae6db60ff56de5b93de9f6fee6116cbc2d4b498e) (cherry picked from commit 8e957b78e6846c57e70d9c302c027fa02f13bb14) --- libexec/rc/rc.d/zpoolreguid | 2 +- libexec/rc/rc.d/zpoolupgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/zpoolreguid b/libexec/rc/rc.d/zpoolreguid index f94630d9283f..c19f52d3d702 100755 --- a/libexec/rc/rc.d/zpoolreguid +++ b/libexec/rc/rc.d/zpoolreguid @@ -2,7 +2,7 @@ # PROVIDE: zpoolreguid # REQUIRE: zpool -# BEFORE: mountcritlocal +# BEFORE: FILESYSTEMS # KEYWORD: firstboot nojail . /etc/rc.subr diff --git a/libexec/rc/rc.d/zpoolupgrade b/libexec/rc/rc.d/zpoolupgrade index 1435cba7199c..5e623a9c2bf0 100755 --- a/libexec/rc/rc.d/zpoolupgrade +++ b/libexec/rc/rc.d/zpoolupgrade @@ -2,7 +2,7 @@ # PROVIDE: zpoolupgrade # REQUIRE: zpool -# BEFORE: mountcritlocal +# BEFORE: FILESYSTEMS # KEYWORD: firstboot nojail . /etc/rc.subr