svn commit: r357665 - head/sys/geom/eli

[Kyle Evans]

Author: kevans
Date: Fri Feb  7 21:36:14 2020
New Revision: 357665
URL: https://svnweb.freebsd.org/changeset/base/357665

Log:
  geli taste: allow GELIBOOT tagged providers as well
  
  Currently the installer will tag geliboot partitions with both BOOT and
  GELIBOOT; the former allows the kernel to taste it at boot, while the latter
  is what loaders keys off of.
  
  However, it seems reasonable to assume that if a provider's been tagged with
  GELIBOOT that the kernel should also take that as a hint to taste/attach at
  boot. This would allow us to stop tagging GELIBOOT partitions with BOOT in
  bsdinstall, but I'm not sure that there's a compelling reason to do so any
  time soon.
  
  Reviewed by:	oshogbo
  Differential Revision:	https://reviews.freebsd.org/D23387

Modified:
  head/sys/geom/eli/g_eli.c

Modified: head/sys/geom/eli/g_eli.c
==============================================================================
--- head/sys/geom/eli/g_eli.c	Fri Feb  7 19:53:07 2020	(r357664)
+++ head/sys/geom/eli/g_eli.c	Fri Feb  7 21:36:14 2020	(r357665)
@@ -1169,7 +1169,8 @@ g_eli_taste(struct g_class *mp, struct g_provider *pp,
 	if (md.md_provsize != pp->mediasize)
 		return (NULL);
 	/* Should we attach it on boot? */
-	if (!(md.md_flags & G_ELI_FLAG_BOOT))
+	if (!(md.md_flags & G_ELI_FLAG_BOOT) &&
+	    !(md.md_flags & G_ELI_FLAG_GELIBOOT))
 		return (NULL);
 	if (md.md_keys == 0x00) {
 		G_ELI_DEBUG(0, "No valid keys on %s.", pp->name);