From owner-svn-src-head@freebsd.org  Thu Mar 22 04:16:15 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D7E6F655B6;
 Thu, 22 Mar 2018 04:16:15 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0E8AB7C3B3;
 Thu, 22 Mar 2018 04:16:15 +0000 (UTC)
 (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0952548BE;
 Thu, 22 Mar 2018 04:16:15 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2M4GEW9006377;
 Thu, 22 Mar 2018 04:16:14 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2M4GEWH006376;
 Thu, 22 Mar 2018 04:16:14 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201803220416.w2M4GEWH006376@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Thu, 22 Mar 2018 04:16:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r331341 - head/stand/forth
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/stand/forth
X-SVN-Commit-Revision: 331341
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Mar 2018 04:16:15 -0000

Author: kevans
Date: Thu Mar 22 04:16:14 2018
New Revision: 331341
URL: https://svnweb.freebsd.org/changeset/base/331341

Log:
  forthloader: Don't break BIOS boots...
  
  I thought I tested this scenario, but clearly I failed to. =(
  
  BIOS boots won't have efi-autoresizecons, so trying to use it as a forth
  word fails during include. Use evaluate on "efi-autoresizecons" as a string
  instead to move any potential errors to runtime- safely after we've already
  checked that we're booting UEFI.
  
  Pointy hat to:	me
  Reported by:	cy

Modified:
  head/stand/forth/efi.4th

Modified: head/stand/forth/efi.4th
==============================================================================
--- head/stand/forth/efi.4th	Thu Mar 22 02:04:57 2018	(r331340)
+++ head/stand/forth/efi.4th	Thu Mar 22 04:16:14 2018	(r331341)
@@ -34,7 +34,7 @@ only forth definitions
 
 : maybe-efi-resizecons
 	efiboot? if
-		efi-autoresizecons
+		s" efi-autoresizecons" evaluate
 	then
 ;