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

Fix wrong commit

Browse source
This commit is contained in:
Vladimir Serbinenko 2014-09-21 18:18:03 +02:00
parent 0aece00c54
commit 5e42618e00
7 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -302,7 +302,7 @@ grub_enter_normal_mode (const char *config)
nested_level++; nested_level++;
grub_normal_execute (config, 0, 0); grub_normal_execute (config, 0, 0);
grub_boot_time ("Entering shell"); grub_boot_time ("Entering shell");
grub_cmdline_run (0, 1); grub_cmdline_run (0);
nested_level--; nested_level--;
if (grub_normal_exit_level) if (grub_normal_exit_level)
grub_normal_exit_level--; grub_normal_exit_level--;
@ -424,15 +424,11 @@ grub_normal_read_line (char **line, int cont,
} }
void void
grub_cmdline_run (int nested, int force_auth) grub_cmdline_run (int nested)
{ {
grub_err_t err = GRUB_ERR_NONE; grub_err_t err = GRUB_ERR_NONE;
do
{
err = grub_auth_check_authentication (NULL); err = grub_auth_check_authentication (NULL);
}
while (err && force_auth);
if (err) 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': case 'c':
menu_fini (); menu_fini ();
grub_cmdline_run (1, 0); grub_cmdline_run (1);
goto refresh; goto refresh;
case 'e': 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_CTRL | 'c':
case GRUB_TERM_KEY_F2: case GRUB_TERM_KEY_F2:
grub_cmdline_run (1, 0); grub_cmdline_run (1);
goto refresh; goto refresh;
case GRUB_TERM_CTRL | 'x': case GRUB_TERM_CTRL | 'x':

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

@ -109,7 +109,7 @@ cmdline_cat_test (void)
grub_video_checksum ("cmdline_cat"); grub_video_checksum ("cmdline_cat");
if (!grub_test_use_gfxterm ()) if (!grub_test_use_gfxterm ())
grub_cmdline_run (1, 0); grub_cmdline_run (1);
grub_test_use_gfxterm_end (); 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); struct grub_term_output *term);
void grub_normal_init_page (struct grub_term_output *term, int y); void grub_normal_init_page (struct grub_term_output *term, int y);
char *grub_file_getline (grub_file_t file); char *grub_file_getline (grub_file_t file);
void grub_cmdline_run (int nested, int force_auth); void grub_cmdline_run (int nested);
/* Defined in `cmdline.c'. */ /* Defined in `cmdline.c'. */
char *grub_cmdline_get (const char *prompt); char *grub_cmdline_get (const char *prompt);