Hello, OKUJI!

I forgot to mention that I was trying to run "install" from the menu.
Actually, the same problem exists in stage2.

A quick fix is attached.

ChangeLog:

        * stage2/stage2.c (run_menu): continue only if the fallback
        has not yet been tried. Exit from the loop if run_script()
        was successful

The end of run_menu() is currently very similar to run_script()
I think that the fallback processing should only be left in one of the
functions. Also, one of them should print "Failed" if the fallback has
failed, and only one of them should ask for "any key"

By the way, run_script is only called by run_menu. It is possible to
merge them and split again after removing duplicated code.

Pavel Roskin

--- stage2/stage2.c     Mon Sep  6 18:35:20 1999
+++ stage2/stage2.c     Wed Sep  8 00:21:04 1999
@@ -503,9 +503,7 @@
            {
              /* Both the entry and the fallback failed, so wait for
                 input.  */
-             grub_printf ("      Press any key to continue...");
-             (void) getkey ();
-             break;
+             grub_printf ("Failed!\n");
            }
          else
            {
@@ -513,8 +511,12 @@
              first_entry = 0;
              entryno = fallback_entry;
              fallback_entry = -1;
+             continue;
            }
        }
+      grub_printf ("      Press any key to continue...");
+      (void) getkey ();
+      break;
     }
   
   goto restart;

Reply via email to