svn commit: r339696 - stable/12/stand/forth

[Devin Teske]

Author: dteske
Date: Wed Oct 24 23:13:53 2018
New Revision: 339696
URL: https://svnweb.freebsd.org/changeset/base/339696

Log:
  MFC r339509: Fix loader.conf(5) "password" feature
  
  Restore the ability to prevent the user from interrupting the boot process
  without first entering the password stored in loader.conf(5).
  
  PR:		kern/207069
  Reported by:	david at dcrosstech.com
  Approved by:	re (rgrimes)
  Sponsored by:	Smule, Inc.

Modified:
  stable/12/stand/forth/check-password.4th
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/stand/forth/check-password.4th
==============================================================================
--- stable/12/stand/forth/check-password.4th	Wed Oct 24 20:49:51 2018	(r339695)
+++ stable/12/stand/forth/check-password.4th	Wed Oct 24 23:13:53 2018	(r339696)
@@ -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