From owner-svn-src-head@freebsd.org Sun Apr 8 11:39:28 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 F05A1F9C07C; Sun, 8 Apr 2018 11:39:27 +0000 (UTC) (envelope-from tsoome@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 A726F6A407; Sun, 8 Apr 2018 11:39:27 +0000 (UTC) (envelope-from tsoome@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 9ED3D7499; Sun, 8 Apr 2018 11:39:27 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w38BdR6m047039; Sun, 8 Apr 2018 11:39:27 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w38BdR0t047036; Sun, 8 Apr 2018 11:39:27 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201804081139.w38BdR0t047036@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Sun, 8 Apr 2018 11:39:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332270 - head/stand/forth X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/forth X-SVN-Commit-Revision: 332270 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: Sun, 08 Apr 2018 11:39:28 -0000 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 Modified: head/stand/forth/loader.4th ============================================================================== --- head/stand/forth/loader.4th Sun Apr 8 11:37:00 2018 (r332269) +++ head/stand/forth/loader.4th Sun Apr 8 11:39:27 2018 (r332270) @@ -46,6 +46,9 @@ include /boot/support.4th include /boot/color.4th include /boot/delay.4th include /boot/check-password.4th +s" efi-version" getenv? [if] + include /boot/forth/efi.4th +[then] only forth definitions Modified: head/stand/forth/loader.rc ============================================================================== --- head/stand/forth/loader.rc Sun Apr 8 11:37:00 2018 (r332269) +++ head/stand/forth/loader.rc Sun Apr 8 11:39:27 2018 (r332270) @@ -6,14 +6,11 @@ \ \ 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