svn commit: r349380 - head/lib/libbe

[Kyle Evans]

Author: kevans
Date: Tue Jun 25 18:13:39 2019
New Revision: 349380
URL: https://svnweb.freebsd.org/changeset/base/349380

Log:
  libbe(3): mount: the BE dataset is mounted at /
  
  Other parts of libbe(3) were fairly strict on the mountpoint property of the
  BE dataset, and be_mount was not much better. It was improved in r347027 to
  allow mountpoint=none for depth==0, but this bit was still sensitive to
  mountpoint != / and mountpoint != none. Given that other parts of libbe(3)
  no longer restrict the mountpoint property here, and the rest of the base
  system is generally OK and will assume that a BE is mounted at /, let's do
  the same.
  
  Reported by:	ler
  MFC after:	3 days

Modified:
  head/lib/libbe/be_access.c

Modified: head/lib/libbe/be_access.c
==============================================================================
--- head/lib/libbe/be_access.c	Tue Jun 25 17:27:37 2019	(r349379)
+++ head/lib/libbe/be_access.c	Tue Jun 25 18:13:39 2019	(r349380)
@@ -96,7 +96,7 @@ be_mount_iter(zfs_handle_t *zfs_hdl, void *data)
 	    NULL, NULL, 0, 1))
 		return (1);
 
-	if (strcmp("none", zfs_mnt) == 0) {
+	if (strcmp("none", zfs_mnt) == 0 || info->depth == 0) {
 		/*
 		 * mountpoint=none; we'll mount it at info->mountpoint assuming
 		 * we're at the root.  If we're not at the root, we're likely