From 86375a7ea93bcf87dc85e4dcd7a44ff316530c91 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 14 Dec 2017 17:00:24 +0000
Subject: [PATCH] Turn loader GELI support in the boot loaders off by default
 as a temporary workaround. This fixes zfs booting generally, but breaks all
 GELI booting by default. Add note to UPDATING to this effect. When the GELI
 issues are resolved, this will be reverted.

---
 UPDATING                    | 6 ++++++
 share/mk/src.opts.mk        | 2 +-
 stand/i386/zfsboot/zfsldr.S | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/UPDATING b/UPDATING
index d322bcbcb2e3..d28c2ff60074 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,6 +51,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20171214:
+	r362593 broke ZFS + GELI support for reasons unknown. However,
+	it also broke ZFS support generally, so GELI has been turned off
+	by default as the lessor evil in r326857. If you boot off ZFS and/or
+	GELI, it might not be a good time to update.
+
 20171125:
 	PowerPC users must update loader(8) by rebuilding world before
 	installing a new kernel, as the protocol connecting them has
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index b8ba2586617b..afd74c30be51 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -119,7 +119,6 @@ __DEFAULT_YES_OPTIONS = \
     LIB32 \
     LIBPTHREAD \
     LIBTHR \
-    LOADER_GELI \
     LOCALES \
     LOCATE \
     LPR \
@@ -183,6 +182,7 @@ __DEFAULT_NO_OPTIONS = \
     LIBSOFT \
     LOADER_FIREWIRE \
     LOADER_FORCE_LE \
+    LOADER_GELI \
     NAND \
     OFED \
     OPENLDAP \
diff --git a/stand/i386/zfsboot/zfsldr.S b/stand/i386/zfsboot/zfsldr.S
index 3e85e27aa38c..bf43a5cbc364 100644
--- a/stand/i386/zfsboot/zfsldr.S
+++ b/stand/i386/zfsboot/zfsldr.S
@@ -33,7 +33,7 @@
 		.set SIZ_PAG,0x1000		# Page size
 		.set SIZ_SEC,0x200		# Sector size
 		.set COPY_BLKS,0x8		# Number of blocks
-						# to copy for boot2
+						# to copy for boot2 (<= 15)
 		.set COPY_BLK_SZ,0x8000		# Copy in 32k blocks; must be
 						# a multiple of 16 bytes
 		.set NSECT,(COPY_BLK_SZ / SIZ_SEC * COPY_BLKS)