vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix a bug in run_menu.

Browse source
This commit is contained in:
okuji 1999-09-08 04:31:10 +00:00
parent 6ec8139b75
commit f2151e4b57
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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.

5
stage2/cmdline.c
View file

@ -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;

10
stage2/stage2.c
View file

@ -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)
{ break;
/* Both the entry and the fallback failed, so wait for
input. */
grub_printf (" Press any key to continue...");
(void) getkey ();
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;