From 75781d7c7b359d69732becca2a7e853f2ec59cd0 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Wed, 7 Sep 2005 16:42:31 +0000 Subject: [PATCH] 1-second-delayed-shutdown reinstated to fix shutdown mess; possible now due to boot monitor cooperation. --- kernel/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/main.c b/kernel/main.c index 1934e78ec..641e63351 100755 --- a/kernel/main.c +++ b/kernel/main.c @@ -219,11 +219,11 @@ int how; */ kprintf("MINIX will now be shut down ...\n"); tmr_arg(&shutdown_timer)->ta_int = how; -#if DEAD_CODE /* timer hangs the boot monitor ... to be fixed! */ + + /* Continue after 1 second, to give processes a chance to get + * scheduled to do shutdown work. + */ set_timer(&shutdown_timer, get_uptime() + HZ, shutdown); -#else - shutdown(&shutdown_timer); -#endif } /*==========================================================================*