svn commit: r297692 - head/sys/boot/geli

[Allan Jude]

Author: allanjude
Date: Fri Apr  8 01:27:40 2016
New Revision: 297692
URL: https://svnweb.freebsd.org/changeset/base/297692

Log:
  GELIBoot should only prompt for the GELI passphrase if the provider has the G_ELI_FLAG_GELIBOOT set
  
  PR:		208251
  Sponsored by:	ScaleEngine Inc.
  Differential Revision:	https://reviews.freebsd.org/D5870

Modified:
  head/sys/boot/geli/geliboot.c

Modified: head/sys/boot/geli/geliboot.c
==============================================================================
--- head/sys/boot/geli/geliboot.c	Fri Apr  8 01:25:25 2016	(r297691)
+++ head/sys/boot/geli/geliboot.c	Fri Apr  8 01:27:40 2016	(r297692)
@@ -90,12 +90,12 @@ geli_taste(int read_func(void *vdev, voi
 		return (error);
 	}
 
-	if ((md.md_flags & G_ELI_FLAG_ONETIME)) {
-		/* Swap device, skip it. */
+	if (!(md.md_flags & G_ELI_FLAG_GELIBOOT)) {
+		/* The GELIBOOT feature is not activated */
 		return (1);
 	}
-	if (!(md.md_flags & G_ELI_FLAG_BOOT)) {
-		/* Disk is not GELI boot device, skip it. */
+	if ((md.md_flags & G_ELI_FLAG_ONETIME)) {
+		/* Swap device, skip it. */
 		return (1);
 	}
 	if (md.md_iterations < 0) {