2006-02-08 Jeremy Katz <katzj@redhat.com>

	* loader2/loader.c (doShell): Add support for exec'ing busybox in
	msh mode if it's present on suspend.  We won't include it in
	standard initrds, but for debugging, the ability to chain multiple
	initrds is going to be beautiful.

1 files changed, 16 insertions, 0 deletions

diff --git a/loader2/loader.c b/loader2/loader.c
index f3fd40ba6..f3408d93f 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -126,6 +126,20 @@ void doSuspend(void) {
     exit(1);
 }
 
+void doShell(void) {
+    /* this lets us debug the loader just by having a second initramfs
+     * containing /sbin/busybox */
+    int child, status;
+
+    newtSuspend();
+    if (!(child = fork())) {
+	    execl("/sbin/busybox", "msh", NULL);
+	    _exit(1);
+    }
+    waitpid(child, &status, 0);
+    newtResume();
+}
+
 void startNewt(int flags) {
     if (!newtRunning) {
         char *buf = sdupprintf(_("Welcome to %s"), getProductName());
@@ -139,6 +153,8 @@ void startNewt(int flags) {
         newtRunning = 1;
         if (FL_TESTING(flags)) 
             newtSetSuspendCallback((void *) doSuspend, NULL);
+        else if (!access("/sbin/busybox",  X_OK))  {
+            newtSetSuspendCallback((void *) doShell, NULL);
     }
 }