From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 21:44:19 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EFD1A1065694;
	Sat, 30 Jan 2010 21:44:19 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DF3268FC08;
	Sat, 30 Jan 2010 21:44:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ULiJfq017000;
	Sat, 30 Jan 2010 21:44:19 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0ULiJl0016997;
	Sat, 30 Jan 2010 21:44:19 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001302144.o0ULiJl0016997@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 21:44:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203259 - in projects/capabilities8/sys: amd64/conf
	i386/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 21:44:20 -0000

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