summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgordon <gordon@FreeBSD.org>2018-11-27 19:45:25 +0000
committergordon <gordon@FreeBSD.org>2018-11-27 19:45:25 +0000
commit6328944fa5266b9ec6b06cefcc56492e093bd1f6 (patch)
treec549fd1972916c9c0d6b2d8420063f272784b4cb
parent0c30b5b905a80f2101d4c3c5b701cfeea85c079b (diff)
downloadFreeBSD-src-6328944fa5266b9ec6b06cefcc56492e093bd1f6.zip
FreeBSD-src-6328944fa5266b9ec6b06cefcc56492e093bd1f6.tar.gz
Fix deferred kernel loading breaks loader password. [EN-18:15.loader]
Submitted by: dteske Approved by: so Security: FreeBSD-EN-18:15.loader
-rw-r--r--stand/forth/check-password.4th3
1 files changed, 2 insertions, 1 deletions
diff --git a/stand/forth/check-password.4th b/stand/forth/check-password.4th
index d41777c..e799622 100644
--- a/stand/forth/check-password.4th
+++ b/stand/forth/check-password.4th
@@ -129,7 +129,7 @@ variable readlen \ input length
again \ Enter was not pressed; repeat
;
-only forth definitions also password-processing
+only forth definitions also password-processing also support-functions
: check-password ( -- )
@@ -161,6 +161,7 @@ only forth definitions also password-processing
\ We should prevent the user from visiting the menu or dropping to the
\ interactive loader(8) prompt, but still allow the machine to boot...
+ any_conf_read? if load_kernel load_modules then
0 autoboot
\ Only reached if autoboot fails for any reason (including if/when
OpenPOWER on IntegriCloud