diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-15 23:01:43 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-15 23:01:43 +0000 |
commit | 8b3d3082c535e107f415e7daf2e81085ed175501 (patch) | |
tree | ddb334e8bc9075c74ab39d558659470140013ce1 /sys/conf | |
parent | 2bb7e475eeae9ab019b66427855c2a46d9437d27 (diff) |
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.
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/GENERIC | 6 |
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 |