mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-20 22:48:22 +00:00
fix a bug in run_menu.
This commit is contained in:
1 parent
6ec8139b75
commit
f2151e4b57
3 files changed
+11
-11
No files matched your search
@@ -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>
|
1999-09-06 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
|
||||||
|
|
||||||
* stage2/builtins.c (configfile_func): New function.
|
* stage2/builtins.c (configfile_func): New function.
|
||||||
|
|||||||
@@ -171,11 +171,6 @@ run_script (char *script, char *heap)
|
|||||||
|
|
||||||
if (errnum)
|
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...");
|
grub_printf ("Press any key to continue...");
|
||||||
(void) getkey ();
|
(void) getkey ();
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
+2
-6
@@ -500,13 +500,7 @@ restart:
|
|||||||
if (run_script (cur_entry, heap))
|
if (run_script (cur_entry, heap))
|
||||||
{
|
{
|
||||||
if (fallback_entry < 0)
|
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
|
else
|
||||||
{
|
{
|
||||||
cur_entry = NULL;
|
cur_entry = NULL;
|
||||||
@@ -515,6 +509,8 @@ restart:
|
|||||||
fallback_entry = -1;
|
fallback_entry = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
goto restart;
|
goto restart;
|
||||||
|
|||||||
Reference in new issue
Block a user