--- GENERIC	2011-08-27 00:55:13.000000000 -0400
+++ EADLER	2011-09-12 17:35:19.000000000 -0400
@@ -22 +22 @@
-ident		GENERIC
+ident		EADLER
@@ -75,2 +75,2 @@
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+#^options 	WITNESS			# Enable checks to detect deadlocks and cycles
+#^options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
@@ -132,2 +132,2 @@
-device		amr		# AMI MegaRAID
-device		arcmsr		# Areca SATA II RAID
+#^device		amr		# AMI MegaRAID
+#^device		arcmsr		# Areca SATA II RAID
@@ -136,8 +136,8 @@
-device		ciss		# Compaq Smart RAID 5*
-device		dpt		# DPT Smartcache III, IV - See NOTES for options
-device		hptmv		# Highpoint RocketRAID 182x
-device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
-device		iir		# Intel Integrated RAID
-device		ips		# IBM (Adaptec) ServeRAID
-device		mly		# Mylex AcceleRAID/eXtremeRAID
-device		twa		# 3ware 9000 series PATA/SATA RAID
+#^device		ciss		# Compaq Smart RAID 5*
+#^device		dpt		# DPT Smartcache III, IV - See NOTES for options
+#^device		hptmv		# Highpoint RocketRAID 182x
+#^device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
+#^device		iir		# Intel Integrated RAID
+#^device		ips		# IBM (Adaptec) ServeRAID
+#^device		mly		# Mylex AcceleRAID/eXtremeRAID
+#^device		twa		# 3ware 9000 series PATA/SATA RAID
@@ -192,9 +192,9 @@
-device		bxe		# Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet
-device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		em		# Intel PRO/1000 Gigabit Ethernet Family
-device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
-device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
-device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
-device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
-device		txp		# 3Com 3cR990 (``Typhoon'')
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
+#^device		bxe		# Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet
+#^device		de		# DEC/Intel DC21x4x (``Tulip'')
+#^device		em		# Intel PRO/1000 Gigabit Ethernet Family
+#^device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
+#^device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
+#^device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
+#^device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
+#^device		txp		# 3Com 3cR990 (``Typhoon'')
+#^device		vx		# 3Com 3c590, 3c595 (``Vortex'')
@@ -303 +303 @@
-device		urio		# Diamond Rio 500 MP3 player
+#^device		urio		# Diamond Rio 500 MP3 player
@@ -341 +341 @@
-device		snd_es137x	# Ensoniq AudioPCI ES137x
+#^device		snd_es137x	# Ensoniq AudioPCI ES137x
@@ -343,3 +343,10 @@
-device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
-device		snd_uaudio	# USB Audio
-device		snd_via8233	# VIA VT8233x Audio
+#^device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
+#^device		snd_uaudio	# USB Audio
+#^device		snd_via8233	# VIA VT8233x Audio
+
+# Support for Capsicum
+options     CAPABILITIES    # fine-grained rights on file descriptors
+options     CAPABILITY_MODE # sandboxes with no global namespace access
+
+# Support for process descriptors
+options     PROCDESC