From owner-svn-src-all@freebsd.org  Mon Dec  4 02:42:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
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 0A348DBABD2;
 Mon,  4 Dec 2017 02:42:02 +0000 (UTC)
 (envelope-from allanjude@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 CBAEE74A96;
 Mon,  4 Dec 2017 02:42:01 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB42g0PV014419;
 Mon, 4 Dec 2017 02:42:00 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB42g0Uq014418;
 Mon, 4 Dec 2017 02:42:00 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201712040242.vB42g0Uq014418@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Mon, 4 Dec 2017 02:42:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326507 - head/stand/i386/zfsboot
X-SVN-Group: head
X-SVN-Commit-Author: allanjude
X-SVN-Commit-Paths: head/stand/i386/zfsboot
X-SVN-Commit-Revision: 326507
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Dec 2017 02:42:02 -0000

Author: allanjude
Date: Mon Dec  4 02:42:00 2017
New Revision: 326507
URL: https://svnweb.freebsd.org/changeset/base/326507

Log:
  increase maximum size of zfsboot
  
  Previous to the switch from sys/boot to stand/ zfsboot (used for MBR) did
  not support GELI. Now that it is compiled with GELI, it is running out of
  space.
  
  zfsldr (which loads zfsboot) was modified to load 256kb in r304321

Modified:
  head/stand/i386/zfsboot/Makefile

Modified: head/stand/i386/zfsboot/Makefile
==============================================================================
--- head/stand/i386/zfsboot/Makefile	Mon Dec  4 01:16:26 2017	(r326506)
+++ head/stand/i386/zfsboot/Makefile	Mon Dec  4 02:42:00 2017	(r326507)
@@ -62,10 +62,10 @@ zfsldr.out: zfsldr.o
 CLEANFILES+=	zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \
 		zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o
 
-# We currently allow 128k bytes for zfsboot - in practice it could be
+# We currently allow 256k bytes for zfsboot - in practice it could be
 # any size up to 3.5Mb but keeping it fixed size simplifies zfsldr.
 # 
-BOOT2SIZE=	131072
+BOOT2SIZE=	262144
 
 zfsboot2: zfsboot.ld
 	@set -- `ls -l ${.ALLSRC}`; x=$$((${BOOT2SIZE}-$$5)); \