diff options
| author | rwatson <rwatson@FreeBSD.org> | 2011-12-29 22:48:36 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2011-12-29 22:48:36 +0000 |
| commit | a7ba7afe9cad2dcf5c46964688d33d2b0fd0296c (patch) | |
| tree | 3eb441f68f296ad19e3e7a81c60d8e3c1b6f0b7a /sys/i386/conf | |
| parent | 792fdc63c101fa0058ae95c852d3f279ae782302 (diff) | |
| download | FreeBSD-src-a7ba7afe9cad2dcf5c46964688d33d2b0fd0296c.zip FreeBSD-src-a7ba7afe9cad2dcf5c46964688d33d2b0fd0296c.tar.gz | |
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
Diffstat (limited to 'sys/i386/conf')
| -rw-r--r-- | sys/i386/conf/GENERIC | 2 |
1 files changed, 2 insertions, 0 deletions
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 |
