summaryrefslogtreecommitdiff
path: root/debian/patches/random-fixes0001-kern-bootstrap-drop-into-the-debugger.patch
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2015-09-27 14:42:24 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-09-27 14:42:24 +0200
commit2aa383dee5671d2ed42f464aee69810823543c2a (patch)
tree781b3d9e4b022d3307597ebc1e9c06d81489b3b3 /debian/patches/random-fixes0001-kern-bootstrap-drop-into-the-debugger.patch
parent6f3e40e6c19cde3ce42e4142e223b9e990e23563 (diff)
add patch series
Diffstat (limited to 'debian/patches/random-fixes0001-kern-bootstrap-drop-into-the-debugger.patch')
-rw-r--r--debian/patches/random-fixes0001-kern-bootstrap-drop-into-the-debugger.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/debian/patches/random-fixes0001-kern-bootstrap-drop-into-the-debugger.patch b/debian/patches/random-fixes0001-kern-bootstrap-drop-into-the-debugger.patch
new file mode 100644
index 0000000..e971491
--- /dev/null
+++ b/debian/patches/random-fixes0001-kern-bootstrap-drop-into-the-debugger.patch
@@ -0,0 +1,40 @@
+From 74cf1713f195ca5f1665a9fc65a6bec9985925b0 Mon Sep 17 00:00:00 2001
+From: Justus Winter <4winter@informatik.uni-hamburg.de>
+Date: Sun, 27 Sep 2015 14:35:27 +0200
+Subject: [PATCH gnumach 1/2] 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.
+---
+ kern/bootstrap.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/kern/bootstrap.c b/kern/bootstrap.c
+index bb6606c..779f913 100644
+--- a/kern/bootstrap.c
++++ b/kern/bootstrap.c
+@@ -823,10 +823,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);
+ }
+--
+2.1.4
+