Note GELI-enabled zfsboot issues have been solved. Flip the switch

back to enabling GELI in boot and loader builds.

Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-12-15 23:19:49 +00:00
parent 6562843997
commit 6e050ee62a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=326888
2 changed files with 5 additions and 1 deletions

View File

@ -51,6 +51,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
****************************** SPECIAL WARNING: ****************************** ****************************** SPECIAL WARNING: ******************************
20171215:
r326887 fixes the issue described in the 20171214 UPDATING entry.
r326888 flips the switch back to building GELI support always.
20171214: 20171214:
r362593 broke ZFS + GELI support for reasons unknown. However, r362593 broke ZFS + GELI support for reasons unknown. However,
it also broke ZFS support generally, so GELI has been turned off it also broke ZFS support generally, so GELI has been turned off

View File

@ -124,6 +124,7 @@ __DEFAULT_YES_OPTIONS = \
LPR \ LPR \
LS_COLORS \ LS_COLORS \
LZMA_SUPPORT \ LZMA_SUPPORT \
LOADER_GELI \
MAIL \ MAIL \
MAILWRAPPER \ MAILWRAPPER \
MAKE \ MAKE \
@ -182,7 +183,6 @@ __DEFAULT_NO_OPTIONS = \
LIBSOFT \ LIBSOFT \
LOADER_FIREWIRE \ LOADER_FIREWIRE \
LOADER_FORCE_LE \ LOADER_FORCE_LE \
LOADER_GELI \
NAND \ NAND \
OFED \ OFED \
OPENLDAP \ OPENLDAP \