summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2007-03-19 14:33:29 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2007-03-19 14:33:29 +0000
commit064833876ff1e42207036f9071ff4396cd97fd4f (patch)
tree4ee7daf46f72f4f1a090678e7ac5286fc7c85289 /sys/conf/GENERIC
parented6150a6c21fc42da1a47b01cc465742c0a793fe (diff)
attach softraid to the root of the device tree in a machine independant
way, rather than requiring some glue in each machines mainbus probe. it is still commented out. based on a discussion with miod@ ok marco@ deraadt@
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 3b7860fd72c..f1f33ea0648 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.125 2006/08/03 16:13:24 mbalmer Exp $
+# $OpenBSD: GENERIC,v 1.126 2007/03/19 14:33:28 dlg Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -68,6 +68,9 @@ option PPP_DEFLATE
option MROUTING # Multicast router
#option PIM # Protocol Independent Multicast
+#softraid0 at root # Software RAID
+#scsibus* at softraid?
+
pseudo-device pf # packet filter
pseudo-device pflog # pf log if
pseudo-device pfsync # pf sync if