From owner-svn-src-all@FreeBSD.ORG Tue Dec 29 05:51:24 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E73F9106566C; Tue, 29 Dec 2009 05:51:24 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D17718FC13; Tue, 29 Dec 2009 05:51:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBT5pOQj012642; Tue, 29 Dec 2009 05:51:24 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBT5pOpA012634; Tue, 29 Dec 2009 05:51:24 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912290551.nBT5pOpA012634@svn.freebsd.org> From: Doug Barton Date: Tue, 29 Dec 2009 05:51:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201164 - in stable/7/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2009 05:51:25 -0000 Author: dougb Date: Tue Dec 29 05:51:24 2009 New Revision: 201164 URL: http://svn.freebsd.org/changeset/base/201164 Log: MFC r200594: Add INCLUDE_CONFIG_FILE, and a note in comments about how to also include the comments with CONFIGARGS Modified: stable/7/sys/amd64/conf/DEFAULTS stable/7/sys/i386/conf/DEFAULTS stable/7/sys/ia64/conf/DEFAULTS stable/7/sys/pc98/conf/DEFAULTS stable/7/sys/powerpc/conf/DEFAULTS stable/7/sys/sparc64/conf/DEFAULTS stable/7/sys/sun4v/conf/DEFAULTS Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/amd64/conf/DEFAULTS ============================================================================== --- stable/7/sys/amd64/conf/DEFAULTS Tue Dec 29 05:50:34 2009 (r201163) +++ stable/7/sys/amd64/conf/DEFAULTS Tue Dec 29 05:51:24 2009 (r201164) @@ -21,3 +21,10 @@ options GEOM_MBR # KSE support went from being default to a kernel option options KSE + +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel Modified: stable/7/sys/i386/conf/DEFAULTS ============================================================================== --- stable/7/sys/i386/conf/DEFAULTS Tue Dec 29 05:50:34 2009 (r201163) +++ stable/7/sys/i386/conf/DEFAULTS Tue Dec 29 05:51:24 2009 (r201164) @@ -25,3 +25,10 @@ options GEOM_MBR # KSE support went from being default to a kernel option options KSE + +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel Modified: stable/7/sys/ia64/conf/DEFAULTS ============================================================================== --- stable/7/sys/ia64/conf/DEFAULTS Tue Dec 29 05:50:34 2009 (r201163) +++ stable/7/sys/ia64/conf/DEFAULTS Tue Dec 29 05:51:24 2009 (r201164) @@ -20,3 +20,10 @@ options GEOM_PART_MBR # KSE support went from being default to a kernel option options KSE + +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel Modified: stable/7/sys/pc98/conf/DEFAULTS ============================================================================== --- stable/7/sys/pc98/conf/DEFAULTS Tue Dec 29 05:50:34 2009 (r201163) +++ stable/7/sys/pc98/conf/DEFAULTS Tue Dec 29 05:51:24 2009 (r201164) @@ -27,3 +27,10 @@ options GEOM_PC98 # KSE support went from being default to a kernel option options KSE + +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel Modified: stable/7/sys/powerpc/conf/DEFAULTS ============================================================================== --- stable/7/sys/powerpc/conf/DEFAULTS Tue Dec 29 05:50:34 2009 (r201163) +++ stable/7/sys/powerpc/conf/DEFAULTS Tue Dec 29 05:51:24 2009 (r201164) @@ -17,3 +17,10 @@ options GEOM_PART_MBR # KSE support went from being default to a kernel option options KSE + +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel Modified: stable/7/sys/sparc64/conf/DEFAULTS ============================================================================== --- stable/7/sys/sparc64/conf/DEFAULTS Tue Dec 29 05:50:34 2009 (r201163) +++ stable/7/sys/sparc64/conf/DEFAULTS Tue Dec 29 05:51:24 2009 (r201164) @@ -22,3 +22,10 @@ options GEOM_SUNLABEL # Let sunkbd emulate an AT keyboard by default. options SUNKBD_EMULATE_ATKBD + +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel Modified: stable/7/sys/sun4v/conf/DEFAULTS ============================================================================== --- stable/7/sys/sun4v/conf/DEFAULTS Tue Dec 29 05:50:34 2009 (r201163) +++ stable/7/sys/sun4v/conf/DEFAULTS Tue Dec 29 05:51:24 2009 (r201164) @@ -12,3 +12,10 @@ device genclock # Generic clock interfa # Default partitioning schemes options GEOM_BSD options GEOM_SUNLABEL + +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel