svn commit: r339698 - stable/10/sys/boot/forth

[Devin Teske]

Author: dteske
Date: Wed Oct 24 23:21:12 2018
New Revision: 339698
URL: https://svnweb.freebsd.org/changeset/base/339698

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
  Sponsored by:	Smule, Inc.

Modified:
  stable/10/sys/boot/forth/check-password.4th
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/forth/check-password.4th
==============================================================================
--- stable/10/sys/boot/forth/check-password.4th	Wed Oct 24 23:17:17 2018	(r339697)
+++ stable/10/sys/boot/forth/check-password.4th	Wed Oct 24 23:21:12 2018	(r339698)
@@ -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