diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2007-03-19 14:33:29 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-03-19 14:33:29 +0000 |
| commit | 064833876ff1e42207036f9071ff4396cd97fd4f (patch) | |
| tree | 4ee7daf46f72f4f1a090678e7ac5286fc7c85289 /sys/kern/init_main.c | |
| parent | ed6150a6c21fc42da1a47b01cc465742c0a793fe (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/kern/init_main.c')
| -rw-r--r-- | sys/kern/init_main.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index f54f517f4f8..e41810455d8 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.135 2007/03/15 10:22:30 art Exp $ */ +/* $OpenBSD: init_main.c,v 1.136 2007/03/19 14:33:28 dlg Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -97,6 +97,8 @@ extern void nfs_init(void); #endif +#include "softraid.h" + const char copyright[] = "Copyright (c) 1982, 1986, 1989, 1991, 1993\n" "\tThe Regents of the University of California. All rights reserved.\n" @@ -436,6 +438,10 @@ main(void *framep) dostartuphooks(); +#if NSOFTRAID > 0 + config_rootfound("softraid", NULL); +#endif + /* Configure root/swap devices */ if (md_diskconf) (*md_diskconf)(); |