From owner-svn-src-all@FreeBSD.ORG Mon Jan 4 21:33:11 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 4945A1065697; Mon, 4 Jan 2010 21:33:11 +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 2EB718FC1D; Mon, 4 Jan 2010 21:33:11 +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 o04LXBpb085897; Mon, 4 Jan 2010 21:33:11 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o04LXAu4085887; Mon, 4 Jan 2010 21:33:10 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201001042133.o04LXAu4085887@svn.freebsd.org> From: Warner Losh Date: Mon, 4 Jan 2010 21:33:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201535 - in stable/8/sys: amd64/conf arm/conf i386/conf ia64/conf mips/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:33:11 -0000 Author: imp Date: Mon Jan 4 21:33:10 2010 New Revision: 201535 URL: http://svn.freebsd.org/changeset/base/201535 Log: Revert 201158. DEFAULTS isn't for this kind of thing.a Modified: stable/8/sys/amd64/conf/DEFAULTS stable/8/sys/arm/conf/DEFAULTS stable/8/sys/i386/conf/DEFAULTS stable/8/sys/ia64/conf/DEFAULTS stable/8/sys/mips/conf/DEFAULTS stable/8/sys/pc98/conf/DEFAULTS stable/8/sys/powerpc/conf/DEFAULTS stable/8/sys/sparc64/conf/DEFAULTS stable/8/sys/sun4v/conf/DEFAULTS Modified: stable/8/sys/amd64/conf/DEFAULTS ============================================================================== --- stable/8/sys/amd64/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534) +++ stable/8/sys/amd64/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) @@ -20,10 +20,3 @@ options GEOM_PART_BSD options GEOM_PART_EBR options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR - -# 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/8/sys/arm/conf/DEFAULTS ============================================================================== --- stable/8/sys/arm/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534) +++ stable/8/sys/arm/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) @@ -9,10 +9,3 @@ device mem options GEOM_PART_BSD options GEOM_PART_MBR - -# 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/8/sys/i386/conf/DEFAULTS ============================================================================== --- stable/8/sys/i386/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534) +++ stable/8/sys/i386/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) @@ -28,10 +28,3 @@ options GEOM_PART_MBR # enable support for native hardware options NATIVE device atpic - -# 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/8/sys/ia64/conf/DEFAULTS ============================================================================== --- stable/8/sys/ia64/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534) +++ stable/8/sys/ia64/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) @@ -17,10 +17,3 @@ device uart_ns8250 options GEOM_PART_BSD options GEOM_PART_GPT options GEOM_PART_MBR - -# 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/8/sys/mips/conf/DEFAULTS ============================================================================== --- stable/8/sys/mips/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534) +++ stable/8/sys/mips/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) @@ -11,10 +11,3 @@ device uart_ns8250 options GEOM_PART_BSD options GEOM_PART_MBR - -# 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/8/sys/pc98/conf/DEFAULTS ============================================================================== --- stable/8/sys/pc98/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534) +++ stable/8/sys/pc98/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) @@ -24,10 +24,3 @@ device uart_ns8250 # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_PC98 - -# 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/8/sys/powerpc/conf/DEFAULTS ============================================================================== --- stable/8/sys/powerpc/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534) +++ stable/8/sys/powerpc/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) @@ -14,10 +14,3 @@ device uart_z8530 options GEOM_PART_APM options GEOM_PART_MBR - -# 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/8/sys/sparc64/conf/DEFAULTS ============================================================================== --- stable/8/sys/sparc64/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534) +++ stable/8/sys/sparc64/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) @@ -19,10 +19,3 @@ options GEOM_PART_VTOC8 # 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/8/sys/sun4v/conf/DEFAULTS ============================================================================== --- stable/8/sys/sun4v/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534) +++ stable/8/sys/sun4v/conf/DEFAULTS Mon Jan 4 21:33:10 2010 (r201535) @@ -11,10 +11,3 @@ device mem # Memory and kernel memory # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_VTOC8 - -# 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