[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] 469687 - move startNewt again



I moved startNewt too early, so the busProbe stuff was getting called
after newt was starting up, therefore we were getting messages printed
at the top of the newt screen and it looked all wrong.

This patch moves startNewt later in loader, but still keeps it before
the bulk of the tricky network setup.  It also puts the startNewt call
back into the driver disk path which needs it.

- Chris


diff --git a/loader/loader.c b/loader/loader.c
index fa8fa69..af83eff 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1903,11 +1903,10 @@ int main(int argc, char ** argv) {
     /* FIXME: this is a bit of a hack */
     loaderData.modInfo = modInfo;
 
-    if (!FL_CMDLINE(flags))
+    if (FL_MODDISK(flags)) {
         startNewt();
-
-    if (FL_MODDISK(flags))
         loadDriverDisks(DEVICE_ANY, &loaderData);
+    }
 
     if (!access("/dd.img", R_OK)) {
         logMessage(INFO, "found /dd.img, loading drivers");
@@ -1955,6 +1954,9 @@ int main(int argc, char ** argv) {
         }
     }
 
+    if (!FL_CMDLINE(flags))
+        startNewt();
+
     /* can't run gdbserver until after network modules are loaded */
     doGdbserver(&loaderData);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]