From nobody Wed Oct 15 13:26:37 2025 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 4cmsLP39mJz6CNlQ; Wed, 15 Oct 2025 13:26:37 +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 4cmsLP2WjMz3KmS; Wed, 15 Oct 2025 13:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760534797; 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=SmgigluXds5tc67JJ9/2IWQc+CPHejpO/NmgEFvr0rQ=; b=nsJuxQB/EXSTeo9ThYF3cDOxyyfymUxEecDUmTFsTaKvxsUlFUI+R3uBpiQEtWQp8VGSRJ 990MK6XHXCpQDlHF34KiWL5sEAGQcz8wu21ACMgs9LgEs9qvJcSNeYD0S6L4LIbKBwhAb0 m4kn2wtVy6Y5HsgII9XUGpAIsF2hiCeTVbgrS4cRJ0dyRjkJ6ErweDMncsnAgd9sl66wtz pVKV5g6N7bwjXCrBa5JbOiJCi6PdjzFyMXIw3Ix4uo6S8G3BZ+AhPYP+eHdKff50R5x1jA GUsGV1CmOdYTAMXRYUiGqrAlieRiqffZ4MG8/AeFr6BfWB3SlpOC7/XNB4nidQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760534797; 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=SmgigluXds5tc67JJ9/2IWQc+CPHejpO/NmgEFvr0rQ=; b=spdQS4Vutq9Sibk+ToWj7tJ+vgaMtr8xL6KzVTv8GOtqyY8I7Sfhl35ebi1k9fhkUhNWZm rbLsmQF43gV1q3KOguYCWL26qi4/QbIFH/oDOI05h6+NUsD/GKrGHqT4qrTeRDr75EFtf6 B+T6oM8azcBQUwVg4qZFZdixUspqc0cKH7BQTD/HcsDNQDiotT0znGWsf0C5mnkzwPrxCn wpcB4/HlhagrcQmUiLQLDZCckyBSs0WwpxZYK/PHd+HXu67MlktDyjjCWP5mXCeQ0Nlc9Z zQLZUIh8q/kNJEyZqhRZD7cEm42Uyt2bMJta8nt7EzgA7VhQbkxJJiY/L+kuXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760534797; a=rsa-sha256; cv=none; b=j5qc8zJ5R2QZww987XUrcBEoVxoXrfQ13oTS88I865YI4siJZ5YU83iBpKkhXSX9aGWge7 hKNDaZfCzNhWmfQMV23p5mPYo0N7Cqfl055xkaNeq6jfdrZ1YTPFy/HoeQd//HeSulObQA 7KOnNvJ4Ox9CtHFgrOY2+Bs3t9CCdVEIcB2Mvr+hKd9669ZuT3c4/zvXWdhWQdK2G6uKnJ CjunHIUJTul3w7oN7nfKrlTkwu9+7dakg4F3eKuqVi9d7Uk81E2Vh18odbZmci6E17A3vB NAsctqiWei3Mlx77GvBaI6G8P08+5llB7+5awNNzxJq3yGMOiormNoFS5Ve/mg== 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 4cmsLP1z9Kzh8m; Wed, 15 Oct 2025 13:26:37 +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 59FDQbVA051017; Wed, 15 Oct 2025 13:26:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FDQbws051014; Wed, 15 Oct 2025 13:26:37 GMT (envelope-from git) Date: Wed, 15 Oct 2025 13:26:37 GMT Message-Id: <202510151326.59FDQbws051014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8e957b78e684 - stable/15 - rc: Update dependencies for zpool scripts 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8e957b78e6846c57e70d9c302c027fa02f13bb14 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8e957b78e6846c57e70d9c302c027fa02f13bb14 commit 8e957b78e6846c57e70d9c302c027fa02f13bb14 Author: Mark Johnston AuthorDate: 2025-10-08 12:50:54 +0000 Commit: Mark Johnston CommitDate: 2025-10-15 13:23:03 +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. 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) --- 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