From owner-svn-src-all@FreeBSD.ORG Tue Jan 13 12:35:34 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 2E0E3106567E; Tue, 13 Jan 2009 12:35:34 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 11E6F8FC26; Tue, 13 Jan 2009 12:35:34 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DCZXTq003594; Tue, 13 Jan 2009 12:35:33 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0DCZXMr003592; Tue, 13 Jan 2009 12:35:33 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <200901131235.n0DCZXMr003592@svn.freebsd.org> From: Luigi Rizzo Date: Tue, 13 Jan 2009 12:35:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187144 - in head/sys: amd64/conf i386/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, 13 Jan 2009 12:35:35 -0000 Author: luigi Date: Tue Jan 13 12:35:33 2009 New Revision: 187144 URL: http://svn.freebsd.org/changeset/base/187144 Log: Documentation-only change: - add a reference to the config(5) manpage; - hopefully clarify the format of the 'env FILENAME' directive. I am putting these notes in sys/${arch}/conf/GENERIC and not in sys/conf/NOTES because: 1. i386/GENERIC already had reference to a similar option (hints..) and to documentation (handbook) 2. GENERIC is what most users look at when they have to modify or create a new kernel config, so having the suggestion there is more effective. I am only touching i386 and amd64 because the other GENERIC files are already out of sync, and I am not sure what is the overall plan. MFC after: 3 days Modified: head/sys/amd64/conf/GENERIC head/sys/i386/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Tue Jan 13 12:28:14 2009 (r187143) +++ head/sys/amd64/conf/GENERIC Tue Jan 13 12:35:33 2009 (r187144) @@ -1,8 +1,8 @@ # # GENERIC -- Generic kernel configuration file for FreeBSD/amd64 # -# For more information on this file, please read the handbook section on -# Kernel Configuration Files: +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: # # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # @@ -24,6 +24,12 @@ ident GENERIC # To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" # Default places to look for devices. +# Use the following to compile in values accessible to the kernel +# through getenv() (or kenv(1) in userland). The format of the file +# is 'variable=value', see kenv(1) +# +# env "GENERIC.env" + makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options SCHED_ULE # ULE scheduler Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Tue Jan 13 12:28:14 2009 (r187143) +++ head/sys/i386/conf/GENERIC Tue Jan 13 12:35:33 2009 (r187144) @@ -1,8 +1,8 @@ # # GENERIC -- Generic kernel configuration file for FreeBSD/i386 # -# For more information on this file, please read the handbook section on -# Kernel Configuration Files: +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: # # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # @@ -28,9 +28,9 @@ ident GENERIC # Use the following to compile in values accessible to the kernel # through getenv() (or kenv(1) in userland). The format of the file -# is 'variable=value' , same as for hints files. +# is 'variable=value', see kenv(1) # -# env "my_kenv_variables" +# env "GENERIC.env" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols