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

* grub-core/osdep/unix/config.c: Remove extraneous comma.

Browse source
This commit is contained in:
Michael Chang 2014-09-21 17:49:13 +02:00 • committed by Vladimir Serbinenko
parent 631a820038
commit 0aece00c54
9 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
grub-core/normal/main.c
View file

@ -302,7 +302,7 @@ grub_enter_normal_mode (const char *config)
nested_level++;
grub_normal_execute (config, 0, 0);
grub_boot_time ("Entering shell");
grub_cmdline_run (0);
grub_cmdline_run (0, 1);
nested_level--;
if (grub_normal_exit_level)
grub_normal_exit_level--;
@ -424,11 +424,15 @@ grub_normal_read_line (char **line, int cont,
}
void
grub_cmdline_run (int nested)
grub_cmdline_run (int nested, int force_auth)
{
grub_err_t err = GRUB_ERR_NONE;
err = grub_auth_check_authentication (NULL);
do
{
err = grub_auth_check_authentication (NULL);
}
while (err && force_auth);
if (err)
{

2
grub-core/normal/menu.c
View file

@ -773,7 +773,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
case 'c':
menu_fini ();
grub_cmdline_run (1);
grub_cmdline_run (1, 0);
goto refresh;
case 'e':

2
grub-core/normal/menu_entry.c
View file

@ -1396,7 +1396,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
case GRUB_TERM_CTRL | 'c':
case GRUB_TERM_KEY_F2:
grub_cmdline_run (1);
grub_cmdline_run (1, 0);
goto refresh;
case GRUB_TERM_CTRL | 'x':