aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiva Mahadevan <me@svmhdvn.name>2025-03-14 15:52:12 +0000
committerWarner Losh <imp@FreeBSD.org>2025-06-13 15:47:25 +0000
commit900bc0206348a439b3a0625a7239cb87a2dc27c5 (patch)
treeb8a6025302ded55ddb2c2e3ee95807d1345e5765
parentcae3d6c8d40a417f32be165aa9a9b4be86bb7f49 (diff)
rc.d/zpool: change mountcritlocal dep from BEFORE to REQUIRE
In cases where the `/boot` directory is mounted from a different disk, `/boot/zfs/zpool.cache` will not be found during a `rc.d/zpool` run. This is because `/etc/fstab` mounts are mounted in `rc.d/mountcritlocal`, which currently runs AFTER (i.e. `REQUIRE:`) `rc.d/zpool`. This change swaps the `rcorder` of `rc.d/zpool`'s dependency on `mountcritlocal` from `BEFORE:` to `REQUIRE:`. This will ensure that `/boot` (or even `/etc/` in some configurations) to be visible while searching for `zpool.cache`. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1614 Closes: https://github.com/freebsd/freebsd-src/pull/1614
-rwxr-xr-xlibexec/rc/rc.d/zpool3
1 files changed, 1 insertions, 2 deletions
diff --git a/libexec/rc/rc.d/zpool b/libexec/rc/rc.d/zpool
index 94e107bd9ae0..63f040ad122b 100755
--- a/libexec/rc/rc.d/zpool
+++ b/libexec/rc/rc.d/zpool
@@ -3,8 +3,7 @@
#
# PROVIDE: zpool
-# REQUIRE: hostid disks
-# BEFORE: mountcritlocal
+# REQUIRE: hostid disks mountcritlocal
# KEYWORD: nojail
. /etc/rc.subr