svn commit: r326888 - in head: . share/mk

[Warner Losh]

Author: imp
Date: Fri Dec 15 23:19:49 2017
New Revision: 326888
URL: https://svnweb.freebsd.org/changeset/base/326888

Log:
  Note GELI-enabled zfsboot issues have been solved. Flip the switch
  back to enabling GELI in boot and loader builds.
  
  Sponsored by: Netflix

Modified:
  head/UPDATING
  head/share/mk/src.opts.mk

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Dec 15 23:16:53 2017	(r326887)
+++ head/UPDATING	Fri Dec 15 23:19:49 2017	(r326888)
@@ -51,6 +51,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20171215:
+	r326887 fixes the issue described in the 20171214 UPDATING entry.
+	r326888 flips the switch back to building GELI support always.
+
 20171214:
 	r362593 broke ZFS + GELI support for reasons unknown. However,
 	it also broke ZFS support generally, so GELI has been turned off

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Fri Dec 15 23:16:53 2017	(r326887)
+++ head/share/mk/src.opts.mk	Fri Dec 15 23:19:49 2017	(r326888)
@@ -124,6 +124,7 @@ __DEFAULT_YES_OPTIONS = \
     LPR \
     LS_COLORS \
     LZMA_SUPPORT \
+    LOADER_GELI \
     MAIL \
     MAILWRAPPER \
     MAKE \
@@ -182,7 +183,6 @@ __DEFAULT_NO_OPTIONS = \
     LIBSOFT \
     LOADER_FIREWIRE \
     LOADER_FORCE_LE \
-    LOADER_GELI \
     NAND \
     OFED \
     OPENLDAP \