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

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,4 +1,8 @@
2014-21-15 Peter Jones <pjones@redhat.com>
2014-09-21 Michael Chang <mchang@suse.com>
* grub-core/osdep/unix/config.c: Remove extraneous comma.
2014-09-21 Peter Jones <pjones@redhat.com>
* grub-core/loader/arm/linux.c: Initialized initrd_ctx so
we don't free a random pointer from the stack.

4
grub-core/commands/keylayouts.c
View File

@ -173,8 +173,10 @@ grub_term_map_key (grub_keyboard_key_t code, int status)
key = map_key_core (code, status, &alt_gr_consumed);
if (key == 0 || key == GRUB_TERM_SHIFT)
if (key == 0 || key == GRUB_TERM_SHIFT) {
grub_printf ("Unknown key 0x%x detected\n", code);
return GRUB_TERM_NO_KEY;
}
if (status & GRUB_TERM_STATUS_CAPS)
{

2
grub-core/gmodule.pl.in
View File

@ -23,7 +23,7 @@ while (<>) {
}
print " -s $2 $sections{$1}"
if ($sections{$1} ne '0x0');
if ($sections{$1} ne '0x0' and $sections{$1} ne '');
};
close (READELF);
print "\n";

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':

4
grub-core/osdep/unix/config.c
View File

@ -105,8 +105,8 @@ grub_util_load_config (struct grub_util_config *cfg)
*ptr++ = *iptr;
}
strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\", "
"\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\"");
strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\" "
"\"$GRUB_ENABLE_CRYPTODISK\" \"$GRUB_DISTRIBUTOR\"");
argv[2] = script;
argv[3] = '\0';

2
grub-core/tests/cmdline_cat_test.c
View File

@ -109,7 +109,7 @@ cmdline_cat_test (void)
grub_video_checksum ("cmdline_cat");
if (!grub_test_use_gfxterm ())
grub_cmdline_run (1);
grub_cmdline_run (1, 0);
grub_test_use_gfxterm_end ();

2
include/grub/normal.h
View File

@ -66,7 +66,7 @@ void grub_menu_init_page (int nested, int edit,
struct grub_term_output *term);
void grub_normal_init_page (struct grub_term_output *term, int y);
char *grub_file_getline (grub_file_t file);
void grub_cmdline_run (int nested);
void grub_cmdline_run (int nested, int force_auth);
/* Defined in `cmdline.c'. */
char *grub_cmdline_get (const char *prompt);