4 commits

Author	SHA1	Message	Date
Xin LI	90802d88a5	Declare dependency relationship once instead of twice for zpool ... and zvol.	2020-09-05 00:45:46 +00:00
Xin LI	0cd669785d	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	2020-09-04 23:36:43 +00:00
Cy Schubert	a784185078	/etc/zfs/zpool.cache is the preferred (and new) location of zpool.cache. ... Check for it first. Only use /boot/zfs/zpool.cache if the /etc/zfs version is not found and good. Reported by: avg Suggested by: avg, kevans	2020-08-27 14:33:46 +00:00
Cy Schubert	74e2b24f2c	As of r364746 (OpenZFS import) existing ZPOOLs are not imported ... prior to zvol and mountcritlocal resulting in ZVOLs (swap and virtual machine UFS filesystems) being unavailable, leading to boot failures. We move the zpool import from zfs to a new zpool script, with the -N option to avoid mounting datasets while making the ZPOOL's datasets available for "legacy" mount (mountpoint=legacy) and ZVOLs available for subsequent use for swap (in the zvol rc sript) or for UFS or other filesystems in fstab(5), mounted by mountcritlocal. Reviewed by: freqlabs (previous version) Differential Revision: https://reviews.freebsd.org/D26185	2020-08-26 13:13:57 +00:00