From: Ben Gras <ben@minix3.org>
Date: Wed, 7 Sep 2005 16:42:31 +0000 (+0000)
Subject: 1-second-delayed-shutdown reinstated to fix shutdown mess; possible now due
X-Git-Tag: v3.1.0~163
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=75781d7c7b359d69732becca2a7e853f2ec59cd0;p=minix.git

1-second-delayed-shutdown reinstated to fix shutdown mess; possible now due
to boot monitor cooperation.
---

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
 }
 
 /*==========================================================================*