From owner-svn-src-all@FreeBSD.ORG Mon Jan 4 21:45:38 2010 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 4C608106566C; Mon, 4 Jan 2010 21:45:38 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 39EF38FC1D; Mon, 4 Jan 2010 21:45:38 +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 o04Ljcxo088723; Mon, 4 Jan 2010 21:45:38 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o04LjcdN088715; Mon, 4 Jan 2010 21:45:38 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201001042145.o04LjcdN088715@svn.freebsd.org> From: Warner Losh Date: Mon, 4 Jan 2010 21:45:38 +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: r201536 - 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: Mon, 04 Jan 2010 21:45:38 -0000 Author: imp Date: Mon Jan 4 21:45:37 2010 New Revision: 201536 URL: http://svn.freebsd.org/changeset/base/201536 Log: Revert 201164. Truly optional items like this do not belong on DEFAULTS. 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 Modified: stable/7/sys/amd64/conf/DEFAULTS ============================================================================== --- stable/7/sys/amd64/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) +++ stable/7/sys/amd64/conf/DEFAULTS Mon Jan 4 21:45:37 2010 (r201536) @@ -21,10 +21,3 @@ 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 Mon Jan 4 21:33:10 2010 (r201535) +++ stable/7/sys/i386/conf/DEFAULTS Mon Jan 4 21:45:37 2010 (r201536) @@ -25,10 +25,3 @@ 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 Mon Jan 4 21:33:10 2010 (r201535) +++ stable/7/sys/ia64/conf/DEFAULTS Mon Jan 4 21:45:37 2010 (r201536) @@ -20,10 +20,3 @@ 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 Mon Jan 4 21:33:10 2010 (r201535) +++ stable/7/sys/pc98/conf/DEFAULTS Mon Jan 4 21:45:37 2010 (r201536) @@ -27,10 +27,3 @@ 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 Mon Jan 4 21:33:10 2010 (r201535) +++ stable/7/sys/powerpc/conf/DEFAULTS Mon Jan 4 21:45:37 2010 (r201536) @@ -17,10 +17,3 @@ 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 Mon Jan 4 21:33:10 2010 (r201535) +++ stable/7/sys/sparc64/conf/DEFAULTS Mon Jan 4 21:45:37 2010 (r201536) @@ -22,10 +22,3 @@ 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 Mon Jan 4 21:33:10 2010 (r201535) +++ stable/7/sys/sun4v/conf/DEFAULTS Mon Jan 4 21:45:37 2010 (r201536) @@ -12,10 +12,3 @@ 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