From owner-svn-src-all@freebsd.org Thu Dec 14 17:00:25 2017 Return-Path: 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 A9404E876A5; Thu, 14 Dec 2017 17:00:25 +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 72D606D2E7; Thu, 14 Dec 2017 17:00:25 +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 vBEH0OmJ072944; Thu, 14 Dec 2017 17:00:24 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBEH0O87072941; Thu, 14 Dec 2017 17:00:24 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201712141700.vBEH0O87072941@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 14 Dec 2017 17:00:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326857 - in head: . share/mk stand/i386/zfsboot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: . share/mk stand/i386/zfsboot X-SVN-Commit-Revision: 326857 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Dec 2017 17:00:25 -0000 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 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) .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)