From owner-svn-src-all@freebsd.org  Fri Dec 15 23:19:50 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D71FFE8F13A;
 Fri, 15 Dec 2017 23:19:50 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A4A846953F;
 Fri, 15 Dec 2017 23:19:50 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBFNJnOS041457;
 Fri, 15 Dec 2017 23:19:49 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBFNJnJ0041455;
 Fri, 15 Dec 2017 23:19:49 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712152319.vBFNJnJ0041455@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 15 Dec 2017 23:19:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326888 - in head: . share/mk
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in head: . share/mk
X-SVN-Commit-Revision: 326888
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Dec 2017 23:19:50 -0000

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 \