> Author: imp > Date: Thu Dec 14 17:00:24 2017 > New Revision: 326857 > URL: https://svnweb.freebsd.org/changeset/base/326857 > > Log: > 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. > > Modified: > head/UPDATING > head/share/mk/src.opts.mk > head/stand/i386/zfsboot/zfsldr.S
Was the change to this an unintentional oops merge, as This looks to be doing more than what you document in the log entry. > Modified: head/UPDATING > ============================================================================== > --- head/UPDATING Thu Dec 14 16:51:43 2017 (r326856) > +++ head/UPDATING Thu Dec 14 17:00:24 2017 (r326857) > @@ -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 > > Modified: head/share/mk/src.opts.mk > ============================================================================== > --- head/share/mk/src.opts.mk Thu Dec 14 16:51:43 2017 (r326856) > +++ head/share/mk/src.opts.mk Thu Dec 14 17:00:24 2017 (r326857) > @@ -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 \ > > Modified: head/stand/i386/zfsboot/zfsldr.S > ============================================================================== > --- head/stand/i386/zfsboot/zfsldr.S Thu Dec 14 16:51:43 2017 > (r326856) > +++ head/stand/i386/zfsboot/zfsldr.S Thu Dec 14 17:00:24 2017 > (r326857) > @@ -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) This seems to match a commit you just made to other parts of the code. > .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) -- Rod Grimes rgri...@freebsd.org _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
