From 2660c8b56c4a160bb6525cf66f2a712fc528682c Mon Sep 17 00:00:00 2001 From: gordon Date: Tue, 27 Nov 2018 19:45:25 +0000 Subject: [PATCH] Fix deferred kernel loading breaks loader password. [EN-18:15.loader] Submitted by: dteske Approved by: so Security: FreeBSD-EN-18:15.loader --- sys/boot/forth/check-password.4th | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/boot/forth/check-password.4th b/sys/boot/forth/check-password.4th index d41777c8bd2..e7996227c5f 100644 --- a/sys/boot/forth/check-password.4th +++ b/sys/boot/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