Author: dougb
Date: Tue Dec 29 05:35:25 2009
New Revision: 201158
URL: http://svn.freebsd.org/changeset/base/201158

Log:
  MFC r200594:
  
  Add INCLUDE_CONFIG_FILE, and a note in comments about how to also
  include the comments with CONFIGARGS

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
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/amd64/conf/DEFAULTS
==============================================================================
--- stable/8/sys/amd64/conf/DEFAULTS    Tue Dec 29 05:30:23 2009        
(r201157)
+++ stable/8/sys/amd64/conf/DEFAULTS    Tue Dec 29 05:35:25 2009        
(r201158)
@@ -21,3 +21,9 @@ 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      Tue Dec 29 05:30:23 2009        
(r201157)
+++ stable/8/sys/arm/conf/DEFAULTS      Tue Dec 29 05:35:25 2009        
(r201158)
@@ -9,3 +9,10 @@ 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     Tue Dec 29 05:30:23 2009        
(r201157)
+++ stable/8/sys/i386/conf/DEFAULTS     Tue Dec 29 05:35:25 2009        
(r201158)
@@ -28,3 +28,10 @@ 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     Tue Dec 29 05:30:23 2009        
(r201157)
+++ stable/8/sys/ia64/conf/DEFAULTS     Tue Dec 29 05:35:25 2009        
(r201158)
@@ -17,3 +17,10 @@ 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     Tue Dec 29 05:30:23 2009        
(r201157)
+++ stable/8/sys/mips/conf/DEFAULTS     Tue Dec 29 05:35:25 2009        
(r201158)
@@ -11,3 +11,10 @@ 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     Tue Dec 29 05:30:23 2009        
(r201157)
+++ stable/8/sys/pc98/conf/DEFAULTS     Tue Dec 29 05:35:25 2009        
(r201158)
@@ -24,3 +24,10 @@ 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  Tue Dec 29 05:30:23 2009        
(r201157)
+++ stable/8/sys/powerpc/conf/DEFAULTS  Tue Dec 29 05:35:25 2009        
(r201158)
@@ -14,3 +14,10 @@ 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  Tue Dec 29 05:30:23 2009        
(r201157)
+++ stable/8/sys/sparc64/conf/DEFAULTS  Tue Dec 29 05:35:25 2009        
(r201158)
@@ -19,3 +19,10 @@ 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    Tue Dec 29 05:30:23 2009        
(r201157)
+++ stable/8/sys/sun4v/conf/DEFAULTS    Tue Dec 29 05:35:25 2009        
(r201158)
@@ -11,3 +11,10 @@ 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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to