svn commit: r203273 - in projects/capabilities8/sys: amd64/conf i386/conf

[Robert Watson]

Author: rwatson
Date: Sun Jan 31 11:20:27 2010
New Revision: 203273
URL: http://svn.freebsd.org/changeset/base/203273

Log:
  Merge c174011 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Add INVARIANTS to CAPABILITIES configuration -- in 9.x, this has
    no effect, but we use the same config file in 8.x where INVARIANTS
    is not the default.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/sys/amd64/conf/CAPABILITIES
  projects/capabilities8/sys/i386/conf/CAPABILITIES

Modified: projects/capabilities8/sys/amd64/conf/CAPABILITIES
==============================================================================
--- projects/capabilities8/sys/amd64/conf/CAPABILITIES	Sun Jan 31 08:16:37 2010	(r203272)
+++ projects/capabilities8/sys/amd64/conf/CAPABILITIES	Sun Jan 31 11:20:27 2010	(r203273)
@@ -4,6 +4,7 @@ ident CAPABILITIES
 options CAPABILITIES
 options PROCDESC
 options KDTRACE_HOOKS
+options INVARIANTS
 options WITNESS
 options KDB
 options DDB

Modified: projects/capabilities8/sys/i386/conf/CAPABILITIES
==============================================================================
--- projects/capabilities8/sys/i386/conf/CAPABILITIES	Sun Jan 31 08:16:37 2010	(r203272)
+++ projects/capabilities8/sys/i386/conf/CAPABILITIES	Sun Jan 31 11:20:27 2010	(r203273)
@@ -4,6 +4,7 @@ ident CAPABILITIES
 options CAPABILITIES
 options PROCDESC
 options KDTRACE_HOOKS
+options INVARIANTS
 options WITNESS
 options KDB
 options DDB