From owner-svn-src-head@freebsd.org Wed Apr 11 18:02:15 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 0FECDF84420; Wed, 11 Apr 2018 18:02:15 +0000 (UTC) (envelope-from imp@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 B71AB74709; Wed, 11 Apr 2018 18:02:14 +0000 (UTC) (envelope-from imp@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 97DA81F900; Wed, 11 Apr 2018 18:02:14 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3BI2Ej9035382; Wed, 11 Apr 2018 18:02:14 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3BI2Etc035378; Wed, 11 Apr 2018 18:02:14 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201804111802.w3BI2Etc035378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 11 Apr 2018 18:02:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332413 - in head/stand: forth i386/loader X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/stand: forth i386/loader X-SVN-Commit-Revision: 332413 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2018 18:02:15 -0000 Author: imp Date: Wed Apr 11 18:02:13 2018 New Revision: 332413 URL: https://svnweb.freebsd.org/changeset/base/332413 Log: Revert r332275, r332272, r332270 There's problems with them. The order of efi stuff isn't quite right, and there's various problems. Revert until thos problems can be fixed. Reviewed by: kevans@ Modified: head/stand/forth/efi.4th head/stand/forth/loader.4th head/stand/forth/loader.rc head/stand/i386/loader/loader.rc Modified: head/stand/forth/efi.4th ============================================================================== --- head/stand/forth/efi.4th Wed Apr 11 17:28:24 2018 (r332412) +++ head/stand/forth/efi.4th Wed Apr 11 18:02:13 2018 (r332413) @@ -26,5 +26,16 @@ only forth definitions -s" efi-autoresizecons" evaluate +: 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 +; + .( EFI boot environment) cr Modified: head/stand/forth/loader.4th ============================================================================== --- head/stand/forth/loader.4th Wed Apr 11 17:28:24 2018 (r332412) +++ head/stand/forth/loader.4th Wed Apr 11 18:02:13 2018 (r332413) @@ -46,9 +46,6 @@ include /boot/support.4th include /boot/color.4th include /boot/delay.4th include /boot/check-password.4th -s" efi-version" getenv? [if] - include /boot/efi.4th -[then] only forth definitions Modified: head/stand/forth/loader.rc ============================================================================== --- head/stand/forth/loader.rc Wed Apr 11 17:28:24 2018 (r332412) +++ head/stand/forth/loader.rc Wed Apr 11 18:02:13 2018 (r332413) @@ -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 Apr 11 17:28:24 2018 (r332412) +++ head/stand/i386/loader/loader.rc Wed Apr 11 18:02:13 2018 (r332413) @@ -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