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 1934e78ecb2e2626ea0a94e97ba48c7093488454..641e633511d330db26e1d19ab2d2e1c959350f98 100755 (executable)
--- 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
 }
 
 /*==========================================================================*