From owner-svn-src-head@freebsd.org  Sun Feb 21 18:58:07 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 169EFAB0C9C;
 Sun, 21 Feb 2016 18:58:07 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DC2AB178A;
 Sun, 21 Feb 2016 18:58:06 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1LIw5f8041875;
 Sun, 21 Feb 2016 18:58:05 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1LIw5ST041874;
 Sun, 21 Feb 2016 18:58:05 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201602211858.u1LIw5ST041874@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Sun, 21 Feb 2016 18:58:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295867 - head/usr.sbin/config
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Feb 2016 18:58:07 -0000

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