summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2015-09-27 14:35:27 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-09-27 15:45:50 +0200
commitf1401610bbb8363e7f015f07b825320dd69c13ca (patch)
treec823ccf8feb718f4918ab2f99fff20387c0edda3
parentafcbeb533b58affc8c063376056cef21449afcec (diff)
kern/bootstrap: drop into the debugger
* kern/bootstrap.c (boot_script_prompt_task_resume): Drop into the debugger instead of merely waiting for return using `safe_gets', which disables interrupts, making it impossible to break into the debugger using the magic keys.
-rw-r--r--kern/bootstrap.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index aad0fb13..249c605c 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -824,10 +824,18 @@ boot_script_task_resume (struct cmd *cmd)
int
boot_script_prompt_task_resume (struct cmd *cmd)
{
+#if ! MACH_KDB
char xx[5];
+#endif
+
+ printf ("Pausing for %s...\n", cmd->path);
- printf ("Hit return to resume %s...", cmd->path);
+#if ! MACH_KDB
+ printf ("Hit <return> to resume bootstrap.");
safe_gets (xx, sizeof xx);
+#else
+ SoftDebugger("Hit `c<return>' to resume bootstrap.");
+#endif
return boot_script_task_resume (cmd);
}