git: 8e957b78e684 - stable/15 - rc: Update dependencies for zpool scripts
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Oct 2025 13:26:37 UTC
The branch stable/15 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=8e957b78e6846c57e70d9c302c027fa02f13bb14
commit 8e957b78e6846c57e70d9c302c027fa02f13bb14
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-10-08 12:50:54 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
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