svn commit: r295867 - head/usr.sbin/config

[Ian Lepore]

Author: ian
Date: Sun Feb 21 18:58:05 2016
New Revision: 295867
URL: https://svnweb.freebsd.org/changeset/base/295867

Log:
  Document the ability to override compiled-in env and hints using variables
  in the bootloader-provided env.

Modified:
  head/usr.sbin/config/config.5

Modified: head/usr.sbin/config/config.5
==============================================================================
--- head/usr.sbin/config/config.5	Sun Feb 21 18:54:17 2016	(r295866)
+++ head/usr.sbin/config/config.5	Sun Feb 21 18:58:05 2016	(r295867)
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 3, 2005
+.Dd February 21, 2016
 .Dt CONFIG 5
 .Os
 .Sh NAME
@@ -118,7 +118,8 @@ The kernel normally uses an environment 
 by
 .Xr loader 8 .
 This directive makes the kernel ignore the boot environment and use
-the compiled-in environment instead.
+the compiled-in environment instead, unless the boot environment contains
+.Va static_env.disabled=1 .
 .Pp
 This directive is useful for setting kernel tunables in
 embedded environments that do not start from
@@ -141,7 +142,9 @@ time (see
 .Xr device.hints 5 ) .
 This directive configures the kernel to use the static device configuration
 listed in
-.Ar filename .
+.Ar filename ,
+unless the boot environment contains
+.Va static_hints.disabled=1 .
 The file
 .Ar filename
 must conform to the syntax specified by