diff options
| author | dteske <dteske@FreeBSD.org> | 2012-12-12 17:49:01 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2012-12-12 17:49:01 +0000 |
| commit | bde43ee183f5f6d6eeb4949510346a87bf3cb414 (patch) | |
| tree | fb2ba6766af4ce6aaf371450296a86f9ef5acc5d /sys/boot/forth/loader.4th.8 | |
| parent | ef158ba46119c99a67d5c166dc971ae0c8eeb914 (diff) | |
| download | FreeBSD-src-bde43ee183f5f6d6eeb4949510346a87bf3cb414.zip FreeBSD-src-bde43ee183f5f6d6eeb4949510346a87bf3cb414.tar.gz | |
Fix a regression caused by SVN r222417.
Prior to r222417, setting `password' in loader.conf(5) did not prevent boot
but instead only prevented changes to boot options by prompting for password
if autoboot failed or the user interrupted the countdown sequence.
After r222417 the same machine with `password' set in loader.conf(5) would no
longer boot without _always_ entering the password.
This patch restores the old (8.x and older) functionality for password in
loader.conf(5) while adding a new bootlock_password feature to replace the
edge-case should anybody desire the regressed functionality (HINT: great for
PXE servers and/or private distributions).
loader.conf(5) was updated to be more clear with-respect to password setting
(previous text was misleading).
Documentation (loader.conf(5) and check-password.4th(8)) has been updated to
include notes on the new bootlock_password setting.
Special thanks to Alex Verbod for bringing this to my attention and helping to
refine the loader.conf(5) text.
PR: conf/170110
Submitted by: Vitaly Zakharov <ded3axap@gmail.com>
Reviewed by: Alexander Verbod <alexander.verbod@gmail.com>
Diffstat (limited to 'sys/boot/forth/loader.4th.8')
| -rw-r--r-- | sys/boot/forth/loader.4th.8 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8 index 568aa84..6120364 100644 --- a/sys/boot/forth/loader.4th.8 +++ b/sys/boot/forth/loader.4th.8 @@ -99,7 +99,7 @@ This is the command used in the default .Pa /boot/loader.rc file, and it uses the -.Pa autoboot +.Ic autoboot command (see .Xr loader 8 ) , so it can be stopped for further interaction with |
