From owner-svn-src-head@freebsd.org Thu Mar 22 03:30:49 2018 Return-Path: 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 15CD5F6270D; Thu, 22 Mar 2018 03:30:49 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 6BB0F7A3D8; Thu, 22 Mar 2018 03:30:48 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with ESMTPA id yqw2ePy1CXziTyqw4e6ENq; Wed, 21 Mar 2018 21:30:40 -0600 X-Authority-Analysis: v=2.3 cv=X6B81lbe c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=v2DPQv5-lfwA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EMgYP5mRnpT9skovMisA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 75D796FC; Wed, 21 Mar 2018 20:30:38 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id w2M3UbWM004639; Wed, 21 Mar 2018 20:30:37 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id w2M3Ubdx004626; Wed, 21 Mar 2018 20:30:37 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201803220330.w2M3Ubdx004626@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kyle Evans cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r331326 - in head/stand: forth i386/loader In-Reply-To: Message from Kyle Evans of "Wed, 21 Mar 2018 22:01:51 -0000." <201803212201.w2LM1pvl020202@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 21 Mar 2018 20:30:37 -0700 X-CMAE-Envelope: MS4wfPWLc06PAHgWOy7niO16lX4CkcXfRYzrb+y0+AwkPwYPsJ5IbBq9dihLY+FvubNjb1iMQdXGiB5++JTHNMtGSibA1l0MlW6kVP4bcnwjm4oGTFkfOpYv gFNTL3cj4UkXTehOhTaKMAGfa2g88SfqWyPmE1R4tnJgTAVhr2VJfkVZ/Z+NnxcmFS6XKPgiTXOE9cYkMoUSw+FMkoWvofys06du02M5+5X+8DkVatzIrtlH YCBsgMw0xxToWtLywC85V7pbJb7+S4rFKay728o07MGikJROY3bAwrE9URt5Hj7X 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Mar 2018 03:30:49 -0000 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. > + then > +; > + > .( EFI boot environment) cr > > Modified: head/stand/forth/loader.rc > ============================================================================= > = > --- head/stand/forth/loader.rc Wed Mar 21 21:15:43 2018 (r33132 > 5) > +++ head/stand/forth/loader.rc Wed Mar 21 22:01:51 2018 (r33132 > 6) > @@ -6,11 +6,14 @@ > \ > \ Includes additional commands > include /boot/loader.4th > +include /boot/efi.4th > try-include /boot/loader.rc.local > > \ Reads and processes loader.conf variables > \ NOTE: Change to `initialize' if you enable the below boot menu > start > + > +maybe-efi-resizecons > > \ Tests for password -- executes autoboot first if a password was defined > check-password > > Modified: head/stand/i386/loader/loader.rc > ============================================================================= > = > --- head/stand/i386/loader/loader.rc Wed Mar 21 21:15:43 2018 (r33132 > 5) > +++ head/stand/i386/loader/loader.rc Wed Mar 21 22:01:51 2018 (r33132 > 6) > @@ -3,10 +3,13 @@ > \ > \ Includes additional commands > include /boot/loader.4th > +include /boot/efi.4th > try-include /boot/loader.rc.local > > \ Reads and processes loader.conf variables > initialize > + > +maybe-efi-resizecons > > \ Tests for password -- executes autoboot first if a password was defined > check-password > -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.