svn commit: r228973 - in head/sys: amd64/conf i386/conf ia64/conf
pc98/conf powerpc/conf sparc64/conf
Robert Watson
rwatson at FreeBSD.org
Thu Dec 29 22:48:37 UTC 2011
Author: rwatson
Date: Thu Dec 29 22:48:36 2011
New Revision: 228973
URL: http://svn.freebsd.org/changeset/base/228973
Log:
Add "options CAPABILITY_MODE" and "options CAPABILITIES" to GENERIC kernel
configurations for various architectures in FreeBSD 10.x. This allows
basic Capsicum functionality to be used in the default FreeBSD
configuration on non-embedded architectures; process descriptors are not
yet enabled by default.
MFC after: 3 months
Sponsored by: Google, Inc
Modified:
head/sys/amd64/conf/GENERIC
head/sys/i386/conf/GENERIC
head/sys/ia64/conf/GENERIC
head/sys/pc98/conf/GENERIC
head/sys/powerpc/conf/GENERIC
head/sys/sparc64/conf/GENERIC
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Thu Dec 29 22:15:18 2011 (r228972)
+++ head/sys/amd64/conf/GENERIC Thu Dec 29 22:48:36 2011 (r228973)
@@ -60,6 +60,8 @@ options PRINTF_BUFR_SIZE=128 # Prevent
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options CAPABILITY_MODE # Capsicum capability mode
+options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
#options KDTRACE_FRAME # Ensure frames are compiled in
#options KDTRACE_HOOKS # Kernel DTrace hooks
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Thu Dec 29 22:15:18 2011 (r228972)
+++ head/sys/i386/conf/GENERIC Thu Dec 29 22:48:36 2011 (r228973)
@@ -61,6 +61,8 @@ options PRINTF_BUFR_SIZE=128 # Prevent
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options CAPABILITY_MODE # Capsicum capability mode
+options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
#options KDTRACE_HOOKS # Kernel DTrace hooks
options INCLUDE_CONFIG_FILE # Include this file in kernel
Modified: head/sys/ia64/conf/GENERIC
==============================================================================
--- head/sys/ia64/conf/GENERIC Thu Dec 29 22:15:18 2011 (r228972)
+++ head/sys/ia64/conf/GENERIC Thu Dec 29 22:48:36 2011 (r228973)
@@ -26,6 +26,8 @@ ident GENERIC
makeoptions DEBUG=-g # Build kernel with debug information.
options AUDIT # Security event auditing
+options CAPABILITY_MODE # Capsicum capability mode
+options CAPABILITIES # Capsicum capabilities
options CD9660 # ISO 9660 Filesystem
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
options FFS # Berkeley Fast Filesystem
Modified: head/sys/pc98/conf/GENERIC
==============================================================================
--- head/sys/pc98/conf/GENERIC Thu Dec 29 22:15:18 2011 (r228972)
+++ head/sys/pc98/conf/GENERIC Thu Dec 29 22:48:36 2011 (r228973)
@@ -63,6 +63,8 @@ options _KPOSIX_PRIORITY_SCHEDULING # P
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options CAPABILITY_MODE # Capsicum capability mode
+options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
options INCLUDE_CONFIG_FILE # Include this file in kernel
Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC Thu Dec 29 22:15:18 2011 (r228972)
+++ head/sys/powerpc/conf/GENERIC Thu Dec 29 22:48:36 2011 (r228973)
@@ -64,6 +64,8 @@ options SYSVSEM #SYSV-style semaphore
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options CAPABILITY_MODE # Capsicum capability mode
+options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
options INCLUDE_CONFIG_FILE # Include this file in kernel
Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC Thu Dec 29 22:15:18 2011 (r228972)
+++ head/sys/sparc64/conf/GENERIC Thu Dec 29 22:48:36 2011 (r228973)
@@ -60,6 +60,8 @@ options _KPOSIX_PRIORITY_SCHEDULING # P
options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options CAPABILITY_MODE # Capsicum capability mode
+options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
options INCLUDE_CONFIG_FILE # Include this file in kernel
More information about the svn-src-all
mailing list