svn commit: r341093 - releng/11.2/stand/forth

[Gordon Tetlow]

Author: gordon
Date: Tue Nov 27 19:45:25 2018
New Revision: 341093
URL: https://svnweb.freebsd.org/changeset/base/341093

Log:
  Fix deferred kernel loading breaks loader password. [EN-18:15.loader]
  
  Submitted by:	dteske
  Approved by:	so
  Security:	FreeBSD-EN-18:15.loader

Modified:
  releng/11.2/stand/forth/check-password.4th

Modified: releng/11.2/stand/forth/check-password.4th
==============================================================================
--- releng/11.2/stand/forth/check-password.4th	Tue Nov 27 19:45:24 2018	(r341092)
+++ releng/11.2/stand/forth/check-password.4th	Tue Nov 27 19:45:25 2018	(r341093)
@@ -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