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

2009-05-02 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* normal/menu_text.c  (grub_wait_after_message): Print a newline
        after waiting for user input.

        * loader/i386/linux.c: Include `<grub/normal.h>'.
        (grub_cmd_linux): Improve the error message about `ask' mode, by
        waiting for user input so it's not missed (we can do this, since
        user requested interaction).
This commit is contained in:
robertmh 2009-05-02 15:24:28 +00:00
parent d9dc87b01b
commit 6c67de152c
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2009-05-02 Robert Millan <rmh.grub@aybabtu.com>
* normal/menu_text.c (grub_wait_after_message): Print a newline
after waiting for user input.
* loader/i386/linux.c: Include `<grub/normal.h>'.
(grub_cmd_linux): Improve the error message about `ask' mode, by
waiting for user input so it's not missed (we can do this, since
user requested interaction).
2009-05-02 Vladimir Serbinenko <phcoder@gmail.com> 2009-05-02 Vladimir Serbinenko <phcoder@gmail.com>
Added missing lst to grub-mkrescue Added missing lst to grub-mkrescue

8
loader/i386/linux.c
View file

@ -20,6 +20,7 @@
#include <grub/machine/machine.h> #include <grub/machine/machine.h>
#include <grub/machine/memory.h> #include <grub/machine/memory.h>
#include <grub/machine/loader.h> #include <grub/machine/loader.h>
#include <grub/normal.h>
#include <grub/file.h> #include <grub/file.h>
#include <grub/disk.h> #include <grub/disk.h>
#include <grub/err.h> #include <grub/err.h>
@ -584,7 +585,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
vid_mode = GRUB_LINUX_VID_MODE_EXTENDED; vid_mode = GRUB_LINUX_VID_MODE_EXTENDED;
else if (grub_strcmp (val, "ask") == 0) else if (grub_strcmp (val, "ask") == 0)
{ {
grub_error (GRUB_ERR_BAD_ARGUMENT, "Legacy `ask' parameter no longer supported."); grub_printf ("Legacy `ask' parameter no longer supported.\n");
/* We usually would never do this in a loader, but "vga=ask" means user
requested interaction, so it can't hurt to request keyboard input. */
grub_wait_after_message ();
goto fail; goto fail;
} }
else else

1
normal/menu_text.c
View file

@ -41,6 +41,7 @@ grub_wait_after_message (void)
{ {
grub_printf ("\nPress any key to continue..."); grub_printf ("\nPress any key to continue...");
(void) grub_getkey (); (void) grub_getkey ();
grub_putchar ('\n');
} }
static void static void