svn commit: r201534 - in head/sys: amd64/conf arm/conf
i386/conf ia64/conf mips/conf pc98/conf powerpc/conf sparc64/conf
sun4v/conf
M. Warner Losh
imp at bsdimp.com
Mon Jan 4 21:50:48 UTC 2010
Doug (with arch@ cc'd)
I'm sorry that I didn't notice this sooner and comment upon it. It is
a really bad idea for a lot of reasons..
The DEFAULTS file is not for optional items. It is only for items
that are required for all (or almost all) users of the system to build
a working kernel. Including the config file isn't anywhere near
required. In addition, changing it on a stable branch seems like a
big default change. Finally, we're planning on deprecating this file
entirely in the future, so no further changes should be made to it
without discussion.
I've reverted this after chatting on IRC with bz@ and ed at .
I'm posting this to arch@ so that the followup discussion can take
place. *IF* there is wide-spread consensus to add it back, I'll take
care of that leg work (as well as anything I've overlooked in the
back out). But I don't think there's wide-spread support for this in
DEFAULTS...
Warner
In message: <201001042130.o04LU4ln085140 at svn.freebsd.org>
Warner Losh <imp at FreeBSD.org> writes:
: Author: imp
: Date: Mon Jan 4 21:30:04 2010
: New Revision: 201534
: URL: http://svn.freebsd.org/changeset/base/201534
:
: Log:
: Revert 200594. This file isn't intended for these sorts of things.
:
: Modified:
: head/sys/amd64/conf/DEFAULTS
: head/sys/arm/conf/DEFAULTS
: head/sys/i386/conf/DEFAULTS
: head/sys/ia64/conf/DEFAULTS
: head/sys/mips/conf/DEFAULTS
: head/sys/pc98/conf/DEFAULTS
: head/sys/powerpc/conf/DEFAULTS
: head/sys/sparc64/conf/DEFAULTS
: head/sys/sun4v/conf/DEFAULTS
:
: Modified: head/sys/amd64/conf/DEFAULTS
: ==============================================================================
: --- head/sys/amd64/conf/DEFAULTS Mon Jan 4 21:02:01 2010 (r201533)
: +++ head/sys/amd64/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534)
: @@ -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: head/sys/arm/conf/DEFAULTS
: ==============================================================================
: --- head/sys/arm/conf/DEFAULTS Mon Jan 4 21:02:01 2010 (r201533)
: +++ head/sys/arm/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534)
: @@ -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: head/sys/i386/conf/DEFAULTS
: ==============================================================================
: --- head/sys/i386/conf/DEFAULTS Mon Jan 4 21:02:01 2010 (r201533)
: +++ head/sys/i386/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534)
: @@ -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: head/sys/ia64/conf/DEFAULTS
: ==============================================================================
: --- head/sys/ia64/conf/DEFAULTS Mon Jan 4 21:02:01 2010 (r201533)
: +++ head/sys/ia64/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534)
: @@ -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: head/sys/mips/conf/DEFAULTS
: ==============================================================================
: --- head/sys/mips/conf/DEFAULTS Mon Jan 4 21:02:01 2010 (r201533)
: +++ head/sys/mips/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534)
: @@ -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: head/sys/pc98/conf/DEFAULTS
: ==============================================================================
: --- head/sys/pc98/conf/DEFAULTS Mon Jan 4 21:02:01 2010 (r201533)
: +++ head/sys/pc98/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534)
: @@ -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: head/sys/powerpc/conf/DEFAULTS
: ==============================================================================
: --- head/sys/powerpc/conf/DEFAULTS Mon Jan 4 21:02:01 2010 (r201533)
: +++ head/sys/powerpc/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534)
: @@ -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: head/sys/sparc64/conf/DEFAULTS
: ==============================================================================
: --- head/sys/sparc64/conf/DEFAULTS Mon Jan 4 21:02:01 2010 (r201533)
: +++ head/sys/sparc64/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534)
: @@ -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: head/sys/sun4v/conf/DEFAULTS
: ==============================================================================
: --- head/sys/sun4v/conf/DEFAULTS Mon Jan 4 21:02:01 2010 (r201533)
: +++ head/sys/sun4v/conf/DEFAULTS Mon Jan 4 21:30:04 2010 (r201534)
: @@ -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 freebsd-arch
mailing list