From f2151e4b57c49fe78488dda1b87004702b756e0d Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Wed, 8 Sep 1999 04:31:10 +0000
Subject: [PATCH] fix a bug in run_menu.

---
 ChangeLog        |  9 +++++++++
 stage2/cmdline.c |  5 -----
 stage2/stage2.c  | 10 +++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65bb1b2d2..58dc16e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-09-08  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
+
+	* stage2/stage2.c (run_menu): If run_script is successfully
+	finished, break the loop. Reported by Pavel Roskin.
+	Do not wait an input character when FALLBACK_ENTRY is less than
+	zero.
+	* stage2/cmdline.c (run_script): If ERRNUM is non-zero, wait an
+	input character, whether FALLBACK is less than zero or not.
+	
 1999-09-06  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	* stage2/builtins.c (configfile_func): New function.
diff --git a/stage2/cmdline.c b/stage2/cmdline.c
index af245405a..8d7092e8b 100644
--- a/stage2/cmdline.c
+++ b/stage2/cmdline.c
@@ -171,11 +171,6 @@ run_script (char *script, char *heap)
       
       if (errnum)
 	{
-	  /* If FALLBACK_ENTRY does not have any meaningful value, do
-	     not wait for the input.  */
-	  if (fallback_entry < 0)
-	    return 1;
-	  
 	  grub_printf ("Press any key to continue...");
 	  (void) getkey ();
 	  return 1;
diff --git a/stage2/stage2.c b/stage2/stage2.c
index a51c4d300..22e9c2b96 100644
--- a/stage2/stage2.c
+++ b/stage2/stage2.c
@@ -500,13 +500,7 @@ restart:
       if (run_script (cur_entry, heap))
 	{
 	  if (fallback_entry < 0)
-	    {
-	      /* Both the entry and the fallback failed, so wait for
-		 input.  */
-	      grub_printf ("      Press any key to continue...");
-	      (void) getkey ();
-	      break;
-	    }
+	    break;
 	  else
 	    {
 	      cur_entry = NULL;
@@ -515,6 +509,8 @@ restart:
 	      fallback_entry = -1;
 	    }
 	}
+      else
+	break;
     }
   
   goto restart;