diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-12-14 17:00:24 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-12-14 17:00:24 +0000 |
| commit | 86375a7ea93bcf87dc85e4dcd7a44ff316530c91 (patch) | |
| tree | 425ef5e7fec7d873c306c1d06226c0f2743a3c32 /stand | |
| parent | bcee07a1afebf2dc0c965ed8358ea131764f51e5 (diff) | |
| download | src-86375a7ea93bcf87dc85e4dcd7a44ff316530c91.tar.gz src-86375a7ea93bcf87dc85e4dcd7a44ff316530c91.zip | |
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.
Notes
Notes:
svn path=/head/; revision=326857
Diffstat (limited to 'stand')
| -rw-r--r-- | stand/i386/zfsboot/zfsldr.S | 2 |
1 files changed, 1 insertions, 1 deletions
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) |