[PC-BSD Commits] r4097 - pcbsd/trunk-current/system-overlay/usr/PCBSD/conf

[svn at pcbsd.org]

Author: kris
Date: 2009-06-11 10:11:23 -0700 (Thu, 11 Jun 2009)
New Revision: 4097

Modified:
   pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64
   pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386
Log:

Further cleanup of our kernel configs for 8-Current



Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64	2009-06-11 15:51:04 UTC (rev 4096)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.amd64	2009-06-11 17:11:23 UTC (rev 4097)
@@ -262,14 +262,11 @@
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
-device		wlan_scan_ap	# 802.11 AP mode scanning
-device		wlan_scan_sta	# 802.11 STA mode scanning
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
 device		ath_hal		# pci/cardbus chip support
 options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 device		ath_rate_sample	# SampleRate tx rate control for ath
-device		awi		# BayStack 660 and others
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 device		iwi		# Intel Wireless Adapters
@@ -281,8 +278,6 @@
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# BSD-style compatibility pseudo ttys
 device		md		# Memory "disks"
@@ -301,7 +296,6 @@
 device		ehci		# EHCI PCI->USB interface (USB 2.0)
 device		usb		# USB Bus (required)
 #device		udbp		# USB Double Bulk Pipe devices
-device		ugen		# Generic
 device		uhid		# "Human Interface Devices"
 device		ukbd		# Keyboard
 device		ulpt		# Printer
@@ -311,7 +305,6 @@
 device		uath		# Atheros AR5523 wireless NICs
 device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
-device		uscanner	# Scanners
 # USB Serial devices
 device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
 device		ucom		# Generic com ttys

Modified: pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386
===================================================================
--- pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386	2009-06-11 15:51:04 UTC (rev 4096)
+++ pcbsd/trunk-current/system-overlay/usr/PCBSD/conf/PCBSD.i386	2009-06-11 17:11:23 UTC (rev 4097)
@@ -274,14 +274,11 @@
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
-device		wlan_scan_ap	# 802.11 AP mode scanning
-device		wlan_scan_sta	# 802.11 STA mode scanning
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
 device		ath_hal		# pci/cardbus chip support
 options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 device		ath_rate_sample	# SampleRate tx rate control for ath
-device		awi		# BayStack 660 and others
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 #device		wl		# Older non 802.11 Wavelan wireless NIC.
@@ -294,8 +291,6 @@
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# BSD-style compatibility pseudo ttys
 device		md		# Memory "disks"
@@ -314,7 +309,6 @@
 device		ehci		# EHCI PCI->USB interface (USB 2.0)
 device		usb		# USB Bus (required)
 #device		udbp		# USB Double Bulk Pipe devices
-device		ugen		# Generic
 device		uhid		# "Human Interface Devices"
 device		ukbd		# Keyboard
 device		ulpt		# Printer
@@ -325,7 +319,6 @@
 device		uath		# Atheros AR5523 wireless NICs
 device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
-device		uscanner	# Scanners
 # USB Serial devices
 device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
 device		ucom		# Generic com ttys
@@ -359,12 +352,6 @@
 device		sound		# Generic Sound Support
 device		snd_uaudio	# Support for USB Audio
 
-# Enable IPFIREWALL / IPDIVERT for natd to work properly
-options 	IPFIREWALL
-options 	IPFIREWALL_DEFAULT_TO_ACCEPT
-options		IPDIVERT
-options		IPSTEALTH
-
 device 		pf
 device 		pflog
 device 		pfsync