--- elwix/config/ELWIX_i386	2013/07/18 00:18:12	1.1.2.4
+++ elwix/config/ELWIX_i386	2013/08/05 13:10:16	1.2
@@ -1,11 +1,13 @@
-# $Id: ELWIX_i386,v 1.1.2.4 2013/07/18 00:18:12 misho Exp $
+# $Id: ELWIX_i386,v 1.2 2013/08/05 13:10:16 misho Exp $
 # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
-ident		ELWIX
+ident		ELWIX_i386
 
+include		DEFAULTS
+
 hints		"ELWIX_i386.hints"	# Default places to look for devices.
 
 options 	INIT_PATH=/sbin/initx:/sbin/init
@@ -25,12 +27,10 @@ options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
 options 	QUOTA			# Enable disk quotas for UFS
-options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 options 	NFSCLIENT		#Network File System client
 options 	NFSSERVER		#Network File System server
-options		MD_ROOT_SIZE=8000
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
@@ -42,11 +42,10 @@ options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_GATE
 options 	GEOM_UZIP
-options 	GEOM_REDBOOT
-device		geom_redboot
+#device		geom_redboot
 device		geom_map	# to get access to the SPI flash partitions
-device		geom_uncompress	# compressed in-memory filesystem hackery!
-device		geom_uzip	# compressed in-memory filesystem support
+#device		geom_uncompress	# compressed in-memory filesystem hackery!
+#device		geom_uzip	# compressed in-memory filesystem support
 options		GEOM_UNCOMPRESS
 options         GEOM_ELI
 options         GEOM_MIRROR
@@ -431,7 +430,6 @@ device		virtio_balloon	# VirtIO Memory Balloon device
 ### ELWIX Additional custom settings ...
 
 device		if_bridge
-device		bridgestp
 device		tap
 device		gre
 device		lagg
@@ -439,7 +437,7 @@ device		carp
 
 device		siba_bwn
 
-options		NDISAPI
+#options		NDISAPI
 #device		ndis
 
 device		pf
@@ -514,6 +512,9 @@ options		NETGRAPH_BPF
 options		NETGRAPH_GIF
 options		NETGRAPH_GIF_DEMUX
 options		NETGRAPH_BRIDGE
+options		NETGRAPH_VLAN
+options		NETGRAPH_PIPE
+options		NETGRAPH_CAR
 
 options 	NULLFS
 options 	UNIONFS