summaryrefslogtreecommitdiffstats
path: root/sys/ia64/conf
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2011-12-29 22:48:36 +0000
committerrwatson <rwatson@FreeBSD.org>2011-12-29 22:48:36 +0000
commita7ba7afe9cad2dcf5c46964688d33d2b0fd0296c (patch)
tree3eb441f68f296ad19e3e7a81c60d8e3c1b6f0b7a /sys/ia64/conf
parent792fdc63c101fa0058ae95c852d3f279ae782302 (diff)
downloadFreeBSD-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/ia64/conf')
-rw-r--r--sys/ia64/conf/GENERIC2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 542b832..a6e0677 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -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
OpenPOWER on IntegriCloud