From 6e050ee62a820af76719b5c8cd23c0d41c6550cb Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 15 Dec 2017 23:19:49 +0000
Subject: [PATCH] Note GELI-enabled zfsboot issues have been solved. Flip the
 switch back to enabling GELI in boot and loader builds.

Sponsored by: Netflix
---
 UPDATING             | 4 ++++
 share/mk/src.opts.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index d28c2ff60074..b681b1dc5d17 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index afd74c30be51..67c1c811ca8f 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -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 \