Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 15 Oct 2025 19:49:11 GMT
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 24546cb506a0 - releng/15.0 - rc: Update dependencies for zpool scripts
Message-ID:  <202510151949.59FJnBrJ069621@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch releng/15.0 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=24546cb506a0b54b548dd2cf1dfe1e7e029ec146

commit 24546cb506a0b54b548dd2cf1dfe1e7e029ec146
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-10-08 12:50:54 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
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
help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510151949.59FJnBrJ069621>