summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2013-10-01 06:57:26 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2013-10-01 06:57:26 +0000
commiteedff1a9eee26f62a849e6291e064d244d282f2b (patch)
treeed62867be592663c5a71fd597fa7cd01e7bc1697
parent39136341dac1cae1e5a60ad3863297a006e2af47 (diff)
as predicted, problems have been found with mpath. disabling it while they
get figured out.
-rw-r--r--sys/conf/GENERIC10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index a24b005bf27..7f05181509a 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.201 2013/09/28 22:02:04 dlg Exp $
+# $OpenBSD: GENERIC,v 1.202 2013/10/01 06:57:25 dlg Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -64,12 +64,12 @@ option MROUTING # Multicast router
#option PIM # Protocol Independent Multicast
option MPLS # Multi-Protocol Label Switching
-mpath0 at root # SCSI Multipathing
-scsibus* at mpath?
+#mpath0 at root # SCSI Multipathing
+#scsibus* at mpath?
#emc* at scsibus?
#hds* at scsibus?
-rdac* at scsibus?
-sym* at scsibus?
+#rdac* at scsibus?
+#sym* at scsibus?
softraid0 at root # Software RAID
scsibus* at softraid?