svn commit: r331326 - in head/stand: forth i386/loader
Kyle Evans
kevans at freebsd.org
Thu Mar 22 04:19:53 UTC 2018
On Wed, Mar 21, 2018 at 10:30 PM, Cy Schubert <Cy.Schubert at cschubert.com> wrote:
> In message <201803212201.w2LM1pvl020202 at 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. =)
More information about the svn-src-head
mailing list