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

merge mainline into crypto

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-05 16:34:27 +01:00
commit 7d624c2949
68 changed files with 1412 additions and 6282 deletions
Download patch file Download diff file Expand all files Collapse all files

4
normal/main.c
View file

@ -415,7 +415,7 @@ grub_normal_execute (const char *config, int nested, int batch)
read_command_list ();
read_fs_list ();
read_handler_list ();
grub_command_execute ("parser.sh", 0, 0);
grub_command_execute ("parser.grub", 0, 0);
reader_nested = nested;
@ -524,7 +524,7 @@ static grub_err_t
grub_normal_read_line (char **line, int cont)
{
grub_parser_t parser = grub_parser_get_current ();
char prompt[sizeof("> ") - 1 + grub_strlen (parser->name)];
char prompt[sizeof("> ") + grub_strlen (parser->name)];
grub_sprintf (prompt, "%s> ", parser->name);