Date: Wed, 11 Apr 2018 18:02:14 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> 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 Message-ID: <201804111802.w3BI2Etc035378@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804111802.w3BI2Etc035378>