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

* grub-core/normal/main.c: Don't drop to rescue console in

Browse source 
case of password-protected prompt and no menu entries.
This commit is contained in:
Vladimir Serbinenko 2014-09-21 18:51:09 +02:00
parent 7c378c3964
commit 41c6f91fce
6 changed files with 16 additions and 7 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)
{