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

[Robert Watson]

Author: rwatson
Date: Sat Jan 30 21:44:19 2010
New Revision: 203259
URL: http://svn.freebsd.org/changeset/base/203259

Log:
  Merge c173971 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    For sample CAPABILITIES configuration files, set the kernel ident, and
    synchronize between amd64/i386 options.
  
  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	Sat Jan 30 21:09:47 2010	(r203258)
+++ projects/capabilities8/sys/amd64/conf/CAPABILITIES	Sat Jan 30 21:44:19 2010	(r203259)
@@ -1,4 +1,5 @@
 include GENERIC
+ident CAPABILITIES
 
 options CAPABILITIES
 options PROCDESC
@@ -6,4 +7,3 @@ options KDTRACE_HOOKS
 options WITNESS
 options KDB
 options DDB
-

Modified: projects/capabilities8/sys/i386/conf/CAPABILITIES
==============================================================================
--- projects/capabilities8/sys/i386/conf/CAPABILITIES	Sat Jan 30 21:09:47 2010	(r203258)
+++ projects/capabilities8/sys/i386/conf/CAPABILITIES	Sat Jan 30 21:44:19 2010	(r203259)
@@ -1,3 +1,9 @@
 include GENERIC
+ident CAPABILITIES
+
 options CAPABILITIES
 options PROCDESC
+options KDTRACE_HOOKS
+options WITNESS
+options KDB
+options DDB