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
Warner Losh
imp at FreeBSD.org
Mon Jan 4 21:33:11 UTC 2010
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
More information about the svn-src-stable-8
mailing list