From nobody Wed Oct 08 13:01:40 2025 X-Original-To: dev-commits-src-main@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 4chY6s0J5mz69Srb; Wed, 08 Oct 2025 13:01:41 +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 4chY6r6BlHz4235; Wed, 08 Oct 2025 13:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759928500; 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=HQd5UsOj6dlkpb/C8wsR+yALuLDcBrGGOqu5wjYLnqw=; b=d0sHiwjbw1TO+Bee8TQFouoL4VJPzcI39W7bYstIIaBcP0Mu02LoEpgf/khcTO2iCgFnbD 92tUWQ5tkivx2SmEV7kJdL6GUOFS3eqOfLBfP6kQz4UAPgeiGRcpiubr5miR0jc4UwwX9R qbdimtBhyy+28B61bvov7fFgcc8O4RuUp41WZ9P5xPAX8fSJQhiGCHT5hPsmiJtXUiz199 aBcBme6pt4kfARFS/WpgaHckOW2IGnWhUr4b4HFuKCV6/r53wsuzIX64U+92eR0ZzpstUG 2n3ncpOk40zi1G1DiFvJQXhXMnRgAIdSbtDb/s+MkTRXm8y4KlENO1Dy/z77Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759928500; 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=HQd5UsOj6dlkpb/C8wsR+yALuLDcBrGGOqu5wjYLnqw=; b=ShVRNNe+GzoyKiW4rPO4h6LgjPwVmjmfdU/bHJUJo9+kdurYW1PzAHcOfhlx/k7ZFzSS5e duGY5Q6wYW6edG+j0JbEjeiatN/lX4tJIMx9c5FNNzEJuwt1NzHOct4/yth8mLk02DIkVz nyX+566zeP3THWZrVW12tHUc82GePTmjWpeiIbOz7gkACCq7KUsPcgN6qbeX3uutPZW0J9 12+Wz0P8EXF0ROkbOiwJcibzC48DpPPExQWwAGdVYD5Bqzz5EzqQEpwrdYIjNLmzl3MtT1 vlmunThhoXg7s4AAeTpHMQoeEuZsW+8q+9guWCcyLUm3Z4dDKlTGe3G8kGQ+3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759928500; a=rsa-sha256; cv=none; b=jTv52ZFB79lUvvJeb6mwaNt726BpLD6ZG44OZuI7x2gxdxCHLaWqUPJxdcYjMds0OyKhLy VKcN/HXpYQryY/3vwp90b00JFouV7BLGunzPNBi9H95WIJrTzK/3RN29KvFHE4dX7is6SZ 0UHPRPATC1VB4nHIWmYoZ0TkH1NlvZNsAtWzHanIrkAvH3+lG4EZruQyQOLllrjquXqfkC WMnKFoxw6Wp8GVQMyeiiN3rPmECtO8sm3gn8ne2CNqfBOx+H50y7ESxIZCQJUZBTtAUZOm QTmJmbS16GTYt9Ac75M6VevdunE/KH3THnUsc+lWjfYWiF+SxzxwXdYrvxoXdg== 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 4chY6r5Y9vzYjZ; Wed, 08 Oct 2025 13:01:40 +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 598D1eda008713; Wed, 8 Oct 2025 13:01:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 598D1e28008708; Wed, 8 Oct 2025 13:01:40 GMT (envelope-from git) Date: Wed, 8 Oct 2025 13:01:40 GMT Message-Id: <202510081301.598D1e28008708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ae6db60ff56d - main - rc: Update dependencies for zpool scripts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ae6db60ff56de5b93de9f6fee6116cbc2d4b498e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ae6db60ff56de5b93de9f6fee6116cbc2d4b498e commit ae6db60ff56de5b93de9f6fee6116cbc2d4b498e Author: Mark Johnston AuthorDate: 2025-10-08 12:50:54 +0000 Commit: Mark Johnston CommitDate: 2025-10-08 12:50:54 +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 --- 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