]> Zhao Yanbai Git Server - minix.git/commitdiff
Fixed code passed to boot monitor after shutdown.
authorJorrit Herder <jnherder@minix3.org>
Fri, 17 Jun 2005 09:40:02 +0000 (09:40 +0000)
committerJorrit Herder <jnherder@minix3.org>
Fri, 17 Jun 2005 09:40:02 +0000 (09:40 +0000)
kernel/main.c

index ee6c27bd11f185ec72e901511d90025bee63c077..4cec0e484e2e6093127ede5de9c1f533d6b738b9 100755 (executable)
@@ -310,11 +310,10 @@ timer_t *tp;
        /* Return to the boot monitor. Set the program for the boot monitor.
         * For RBT_MONITOR, the MM has provided the program.
         */
-       if (how == RBT_HALT) {
-               phys_copy(vir2phys("delay;menu"), kinfo.params_base, 11); 
-       } else if (how == RBT_REBOOT) {
+       if (how == RBT_REBOOT) 
                phys_copy(vir2phys("delay;boot"), kinfo.params_base, 11);
-       }
+       else 
+               phys_copy(vir2phys("delay"), kinfo.params_base, 6); 
        level0(monitor);
   }