1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-19 02:29:40 +00:00

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@
This commit is contained in:
Warner Losh 2018-04-11 18:02:13 +00:00
parent 0437c8e3b1
commit 7afc7a8717
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=332413
4 changed files with 18 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -6,12 +6,15 @@
\
\ 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

View File

@ -3,11 +3,14 @@
\
\ 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