Make zpool on GELI work again.

After OpenZFS import, zpool auto import behavior was moved to an
explicit "zpool import -a", and the zpool rc.d script was added
as a prerequisite of zvol.

However, in r299839, zvol was added as a prerequisite of dumpon,
making it to start very early and before all 'disks' providers.
At this time, dumping on a zvol is not supported, so remove this
requirement and make zpool depend on disks to allow zpool on
full disk encryption work.

Reviewed by:		allanjude
Differential Revision:	https://reviews.freebsd.org/D26333
This commit is contained in:
Xin LI 2020-09-04 23:36:43 +00:00
parent eac7052fde
commit 0cd669785d
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=365348
2 changed files with 1 additions and 2 deletions

View File

@ -4,7 +4,7 @@
#
# PROVIDE: zpool
# REQUIRE: hostid
# REQUIRE: hostid disks
# BEFORE: zvol mountcritlocal
# KEYWORD: nojail

View File

@ -5,7 +5,6 @@
# PROVIDE: zvol
# REQUIRE: zpool
# BEFORE: dumpon
# KEYWORD: nojail
. /etc/rc.subr