From owner-svn-src-all@freebsd.org Thu Mar 22 04:19:53 2018 Return-Path: Delivered-To: svn-src-all@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 2540DF65847; Thu, 22 Mar 2018 04:19:53 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) (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)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A44D7C548; Thu, 22 Mar 2018 04:19:52 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: by mail-lf0-f51.google.com with SMTP id e5-v6so11106394lfb.7; Wed, 21 Mar 2018 21:19:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=VrbzagRbTmBrOP7RVr8DAQNWiOugo2NpZFD52Re84tk=; b=OCZjSqZ8zi/6pq+zOcyugSPA7YeEU3HKGSmAncqzC0+BAG1bd8ATUIQ1lw97/clOU7 leW139w+4SrKP1JpxNpBBDTKY8ftkIRyh8dIEOg1czS+B7b3RP0ioxzanv21JH08TO3S FqoPNzGQMZQje8jzgEAPBUYbvfsR2YPdeolGuVHVMqlGcVGHcW9oQwKOaQ1BXJAvjMdp PEev5GRgZ9+xEtYrCv3Js0HrcYDk6k3sp/MkbEppcm42EgAKHHD7mQ/iyeeA1GR6rfF4 JyUMsZeGwMS9Hr8NnVKWLZ+8yYa/duc18tNciFis/YfA/zvHmlHhOEG6hqkJEGOO2V4y M89A== X-Gm-Message-State: AElRT7F3mbelG00V96+MZi3lQBNap3AvgRkl02ISQ/3jqgNXOJUQjkHg 9u/IF3UKfVmH8CSe4dQHFvP6i7OH X-Google-Smtp-Source: AG47ELueux+Gw1jQJaSwV3WBz4XZR3v1dwLGxzi4+AKx2IVu4YPNXqWksXcPM2mIRNHCeVG5Izm5iQ== X-Received: by 2002:a19:2655:: with SMTP id m82-v6mr9160791lfm.107.1521692384565; Wed, 21 Mar 2018 21:19:44 -0700 (PDT) Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com. [209.85.215.46]) by smtp.gmail.com with ESMTPSA id s87-v6sm1412210lfk.69.2018.03.21.21.19.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 21:19:44 -0700 (PDT) Received: by mail-lf0-f46.google.com with SMTP id l4-v6so6762975lfg.12; Wed, 21 Mar 2018 21:19:44 -0700 (PDT) X-Received: by 2002:a19:e9cc:: with SMTP id j73-v6mr13712384lfk.99.1521692384287; Wed, 21 Mar 2018 21:19:44 -0700 (PDT) MIME-Version: 1.0 Received: by 10.46.129.90 with HTTP; Wed, 21 Mar 2018 21:19:23 -0700 (PDT) In-Reply-To: <201803220330.w2M3Ubdx004626@slippy.cwsent.com> References: <201803212201.w2LM1pvl020202@repo.freebsd.org> <201803220330.w2M3Ubdx004626@slippy.cwsent.com> From: Kyle Evans Date: Wed, 21 Mar 2018 23:19:23 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r331326 - in head/stand: forth i386/loader To: Cy Schubert Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" 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, 22 Mar 2018 04:19:53 -0000 On Wed, Mar 21, 2018 at 10:30 PM, Cy Schubert wrote: > In message <201803212201.w2LM1pvl020202@repo.freebsd.org>, Kyle Evans > writes: >> Author: kevans >> Date: Wed Mar 21 22:01:51 2018 >> New Revision: 331326 >> URL: https://svnweb.freebsd.org/changeset/base/331326 >> >> Log: >> Forth version of EFI autoresizing >> >> r331321 delegated autoresizing to an efi-autoresizecons command that >> currently is expected to be done in forth/lua prior to drawing anything >> useful. >> >> Add the Forth version of the lua addition in r331321, hook efi.4th up to be >> installed. >> >> efiboot? was written by dteske@; anything outside of that may be blamed on >> me. >> >> Modified: >> head/stand/forth/Makefile >> head/stand/forth/efi.4th >> head/stand/forth/loader.rc >> head/stand/i386/loader/loader.rc >> >> Modified: head/stand/forth/Makefile >> ============================================================================= >> = >> --- head/stand/forth/Makefile Wed Mar 21 21:15:43 2018 (r331325) >> +++ head/stand/forth/Makefile Wed Mar 21 22:01:51 2018 (r331326) >> @@ -18,6 +18,7 @@ FILES+= brand-fbsd.4th >> FILES+= check-password.4th >> FILES+= color.4th >> FILES+= delay.4th >> +FILES+= efi.4th >> FILES+= frames.4th >> FILES+= loader.4th >> FILES+= logo-beastie.4th >> >> Modified: head/stand/forth/efi.4th >> ============================================================================= >> = >> --- head/stand/forth/efi.4th Wed Mar 21 21:15:43 2018 (r331325) >> +++ head/stand/forth/efi.4th Wed Mar 21 22:01:51 2018 (r331326) >> @@ -26,5 +26,16 @@ >> >> only forth definitions >> >> -\ Place holder for more functions >> +: efiboot? ( -- flag ) >> + s" efi-version" getenv -1 <> dup if >> + swap drop ( c-addr flag -- flag ) >> + then >> +; >> + >> +: maybe-efi-resizecons >> + efiboot? if >> + efi-autoresizecons > > This statement breaks boot on my BIOS machines. It cannot find > efi-autoresizecons, causing a bare kernel without modules to load or > kenv variables set. > Ugh, sorry about that. =( I've converted that to a runtime evaluation in r331341 and (hopefully) properly observed my failure to succeed. On the plus side, today I learned about `boot-conf` to get back to the Forth-intercepted 'boot' behavior to workaround the breakage. =)