From a7ba7afe9cad2dcf5c46964688d33d2b0fd0296c Mon Sep 17 00:00:00 2001 From: rwatson Date: Thu, 29 Dec 2011 22:48:36 +0000 Subject: 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 --- sys/i386/conf/GENERIC | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sys/i386/conf/GENERIC') diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index c9b6a18..569b9e1 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -61,6 +61,8 @@ options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. 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 -- cgit v1.1