svn commit: r365348 - head/libexec/rc/rc.d

[Xin LI]

Author: delphij
Date: Fri Sep  4 23:36:43 2020
New Revision: 365348
URL: https://svnweb.freebsd.org/changeset/base/365348

Log:
  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

Modified:
  head/libexec/rc/rc.d/zpool
  head/libexec/rc/rc.d/zvol

Modified: head/libexec/rc/rc.d/zpool
==============================================================================
--- head/libexec/rc/rc.d/zpool	Fri Sep  4 22:25:14 2020	(r365347)
+++ head/libexec/rc/rc.d/zpool	Fri Sep  4 23:36:43 2020	(r365348)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: zpool
-# REQUIRE: hostid
+# REQUIRE: hostid disks
 # BEFORE: zvol mountcritlocal
 # KEYWORD: nojail
 

Modified: head/libexec/rc/rc.d/zvol
==============================================================================
--- head/libexec/rc/rc.d/zvol	Fri Sep  4 22:25:14 2020	(r365347)
+++ head/libexec/rc/rc.d/zvol	Fri Sep  4 23:36:43 2020	(r365348)
@@ -5,7 +5,6 @@
 
 # PROVIDE: zvol
 # REQUIRE: zpool
-# BEFORE: dumpon
 # KEYWORD: nojail
 
 . /etc/rc.subr