From owner-svn-src-head@freebsd.org  Wed Apr 11 17:52:13 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 AF0ABF83923;
 Wed, 11 Apr 2018 17:52:13 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F59572A91;
 Wed, 11 Apr 2018 17:52:10 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from mail-lf0-f50.google.com (mail-lf0-f50.google.com
 [209.85.215.50])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 (Authenticated sender: kevans)
 by smtp.freebsd.org (Postfix) with ESMTPSA id DBF291B43C;
 Wed, 11 Apr 2018 17:52:09 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: by mail-lf0-f50.google.com with SMTP id d20-v6so3863733lfe.3;
 Wed, 11 Apr 2018 10:52:09 -0700 (PDT)
X-Gm-Message-State: ALQs6tCpR2865LvtBG9fRkDNHhzBMQ6URBGOf8tKzvksWuqJ0xOJjUYP
 sGNzp5FKPCvrAg1AN1adi83KJ+Y4J+PivgZaJJI=
X-Google-Smtp-Source: AIpwx48tXCESipX6E+QVJTI1jwAoKo9Hsyjz46p8YlLUxqzdnUCgBC0+Vs9JI/q0I+A0dmyZoL1aC9QxeLp9KAIP29g=
X-Received: by 2002:a19:c4c8:: with SMTP id
 u191-v6mr3634979lff.109.1523469128017; 
 Wed, 11 Apr 2018 10:52:08 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.46.129.90 with HTTP; Wed, 11 Apr 2018 10:51:47 -0700 (PDT)
In-Reply-To: <201804081139.w38BdR0t047036@repo.freebsd.org>
References: <201804081139.w38BdR0t047036@repo.freebsd.org>
From: Kyle Evans <kevans@freebsd.org>
Date: Wed, 11 Apr 2018 12:51:47 -0500
X-Gmail-Original-Message-ID: <CACNAnaFMQWjNdThEYuzdNTsStU3e1g6YhCZXQDtGB888sa5JGA@mail.gmail.com>
Message-ID: <CACNAnaFMQWjNdThEYuzdNTsStU3e1g6YhCZXQDtGB888sa5JGA@mail.gmail.com>
Subject: Re: svn commit: r332270 - head/stand/forth
To: Toomas Soome <tsoome@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, 
 svn-src-head@freebsd.org
Content-Type: text/plain; charset="UTF-8"
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: Wed, 11 Apr 2018 17:52:13 -0000

On Sun, Apr 8, 2018 at 6:39 AM, Toomas Soome <tsoome@freebsd.org> wrote:
> Author: tsoome
> Date: Sun Apr  8 11:39:27 2018
> New Revision: 332270
> URL: https://svnweb.freebsd.org/changeset/base/332270
>
> Log:
>   loader: include efi.4th only if we do have uefi
>
>   Also simplify efi.4th.
>
> Modified:
>   head/stand/forth/efi.4th
>   head/stand/forth/loader.4th
>   head/stand/forth/loader.rc
>
> Modified: head/stand/forth/efi.4th
> ==============================================================================
> --- head/stand/forth/efi.4th    Sun Apr  8 11:37:00 2018        (r332269)
> +++ head/stand/forth/efi.4th    Sun Apr  8 11:39:27 2018        (r332270)
> @@ -26,16 +26,5 @@
>
>  only forth definitions
>
> -: efiboot? ( -- flag )
> -       s" efi-version" getenv -1 <> dup if
> -               swap drop ( c-addr flag -- flag )
> -       then
> -;
> -
> -: maybe-efi-resizecons
> -       efiboot? if
> -               s" efi-autoresizecons" evaluate
> -       then
> -;
> -
> +s" efi-autoresizecons" evaluate
>  .( EFI boot environment) cr
>

This was actually the wrong thing to do, here. efi-autoresizecons
should *not* be executed before loader.conf is invoked, which is why
this was done the way it was.