summaryrefslogtreecommitdiff
path: root/sys/kern/init_main.c
diff options
context:
space:
mode:
authorGrigoriy Orlov <gluk@cvs.openbsd.org>2001-09-29 20:09:35 +0000
committerGrigoriy Orlov <gluk@cvs.openbsd.org>2001-09-29 20:09:35 +0000
commit3987169297d8f3f7f5f444467d6c2826c439520a (patch)
treedc30cc2e2100f02a9ac6522fd4b1f63a1e525910 /sys/kern/init_main.c
parentd3f78f493f474e5bdbc5901cdb6e15937e707b63 (diff)
Move signal initialization before dostartuphooks to avoid panic at
start of raid autoconfiguration thread. Required for upcoming RAIDFrame code update. From Thierry Deval <TDeval@PrimeOBJ.COM>
Diffstat (limited to 'sys/kern/init_main.c')
-rw-r--r--sys/kern/init_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 4af0d315850..fb294afb8a4 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.77 2001/09/17 19:17:30 gluk Exp $ */
+/* $OpenBSD: init_main.c,v 1.78 2001/09/29 20:09:34 gluk Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -366,6 +366,11 @@ main(framep)
/* Start the scheduler */
scheduler_start();
+ /* Initialize signal state for process 0. */
+ signal_init();
+ p->p_sigacts = &sigacts0;
+ siginit(p);
+
dostartuphooks();
/* Configure root/swap devices */
@@ -395,11 +400,6 @@ main(framep)
p->p_stats->p_start = runtime = mono_time = boottime = time;
p->p_rtime.tv_sec = p->p_rtime.tv_usec = 0;
- /* Initialize signal state for process 0. */
- signal_init();
- p->p_sigacts = &sigacts0;
- siginit(p);
-
/* Create process 1 (init(8)). */
if (fork1(p, SIGCHLD, FORK_FORK, NULL, 0, rval))
panic("fork init");