aboutsummaryrefslogtreecommitdiff
path: root/libexec/rc/rc.d/Makefile
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2020-08-26 13:13:57 +0000
committerCy Schubert <cy@FreeBSD.org>2020-08-26 13:13:57 +0000
commit74e2b24f2c369ffdff2f54fa9f96427cc45ef3a6 (patch)
treec9c703e3048da92a1e6f9ffa49771a72a47422f7 /libexec/rc/rc.d/Makefile
parent1e9a0b391d88e0f9a9cb5b1d49aba61f80ae97f5 (diff)
downloadsrc-74e2b24f2c369ffdff2f54fa9f96427cc45ef3a6.tar.gz
src-74e2b24f2c369ffdff2f54fa9f96427cc45ef3a6.zip
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
Notes
Notes: svn path=/head/; revision=364817
Diffstat (limited to 'libexec/rc/rc.d/Makefile')
-rw-r--r--libexec/rc/rc.d/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 77499e483f0d..7e0e63dae414 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -318,6 +318,7 @@ CONFGROUPS+= ZFS
ZFS+= zfs
ZFS+= zfsbe
ZFS+= zfsd
+ZFS+= zpool
ZFS+= zvol
.endif