summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2007-06-15 23:01:42 +0000
committerderaadt <deraadt@openbsd.org>2007-06-15 23:01:42 +0000
commit53cea293ba2436439e8efe035c79a75874538035 (patch)
treec774bd0223e4809342532d3421eaed643d751591
parentCheck that sc_notify actually points to something before attempting to call (diff)
downloadwireguard-openbsd-53cea293ba2436439e8efe035c79a75874538035.tar.xz
wireguard-openbsd-53cea293ba2436439e8efe035c79a75874538035.zip
disable softraid (because sr_boot_assembly->readdisklabel->readdoslabel->biowait)
is what happens on late-cold architectures. something else has to be fixed first before that is permitted, i guess.
-rw-r--r--sys/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index ea35493473d..a523f713bdf 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.133 2007/06/05 08:08:46 henning Exp $
+# $OpenBSD: GENERIC,v 1.134 2007/06/15 23:01:42 deraadt Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -67,8 +67,8 @@ option PPP_DEFLATE
option MROUTING # Multicast router
#option PIM # Protocol Independent Multicast
-softraid0 at root # Software RAID
-scsibus* at softraid?
+#softraid0 at root # Software RAID
+#scsibus* at softraid?
pseudo-device pf # packet filter
pseudo-device pflog # pf log if