[PC-BSD Commits] r2007 - pcbsd/trunk/system-overlay/PCBSD/conf

[svn at pcbsd.org]

Author: kris
Date: 2008-06-02 14:05:33 -0700 (Mon, 02 Jun 2008)
New Revision: 2007

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

Updated kernel configs to include geom_journal, nfe and msk by default



Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64	2008-06-02 21:04:45 UTC (rev 2006)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64	2008-06-02 21:05:33 UTC (rev 2007)
@@ -36,6 +36,7 @@
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options         UFS_GJOURNAL            # Support for journaling on UFS
+options         GEOM_JOURNAL            # Journaling via GEOM
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
@@ -61,6 +62,7 @@
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
+options	        SCTP                    # Stream Control Transmission Protocol
 
 # Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
 device		atpic			# 8259A compatability
@@ -195,7 +197,7 @@
 device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
 device		nge		# NatSemi DP83820 gigabit Ethernet
-device		nve		# nVidia nForce MCP on-board Ethernet Networking
+device		nfe		# nVidia nForce MCP on-board Ethernet Networking
 device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139

Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386	2008-06-02 21:04:45 UTC (rev 2006)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.i386	2008-06-02 21:05:33 UTC (rev 2007)
@@ -39,6 +39,7 @@
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options 	UFS_GJOURNAL		# Support for journaling on UFS
+options 	GEOM_JOURNAL		# Journaling via GEOM
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
@@ -72,8 +73,8 @@
 options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~215k to driver.
 options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
-
 device		apic			# I/O APIC
+options	        SCTP                    # Stream Control Transmission Protocol
 
 # Bus support.
 #device		isa
@@ -210,7 +211,7 @@
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		nge		# NatSemi DP83820 gigabit Ethernet
-#device		nve		# nVidia nForce MCP on-board Ethernet Networking
+device		nfe		# nVidia nForce MCP on-board Ethernet Networking
 device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
@@ -226,6 +227,7 @@
 device		vr		# VIA Rhine, Rhine II
 device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+device          msk             # Marvell/SysKonnect Yukon II Gigabit Ethernet
 
 # ISA Ethernet NICs.  pccard NICs included.
 device		cs		# Crystal Semiconductor CS89x0 NIC