svn commit: r357792 - in stable: 11/sys/geom/eli 12/sys/geom/eli

Kyle Evans kevans at FreeBSD.org
Wed Feb 12 02:17:21 UTC 2020


Author: kevans
Date: Wed Feb 12 02:17:20 2020
New Revision: 357792
URL: https://svnweb.freebsd.org/changeset/base/357792

Log:
  MFC r357665: 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.

Modified:
  stable/11/sys/geom/eli/g_eli.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/sys/geom/eli/g_eli.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sys/geom/eli/g_eli.c
==============================================================================
--- stable/11/sys/geom/eli/g_eli.c	Wed Feb 12 02:09:12 2020	(r357791)
+++ stable/11/sys/geom/eli/g_eli.c	Wed Feb 12 02:17:20 2020	(r357792)
@@ -1080,7 +1080,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);


More information about the svn-src-all mailing list