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).

diff --git a/ChangeLog b/ChangeLog
index b141d0a8a5ee027a5b39c20e0471741aaf8a42f2..f54ef20712bafa592271094a51e111317769203a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        Added missing lst to grub-mkrescue

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 19444f4b8eda6f26386da85d5d46fe0f455cfcf1..c71d9260bceef6255bb2e5c7e899a390ccc1514e 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -20,6 +20,7 @@
 #include <grub/machine/machine.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/loader.h>
+#include <grub/normal.h>
 #include <grub/file.h>
 #include <grub/disk.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;
        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;
          }
        else

diff --git a/normal/menu_text.c b/normal/menu_text.c
index cb229828e915062124efa8eca0ed405a7dab2cff..9e97c32e9a55c21c53a1000205dbb673ed685db4 100644 (file)
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -41,6 +41,7 @@ grub_wait_after_message (void)
 {
   grub_printf ("\nPress any key to continue...");
   (void) grub_getkey ();
+  grub_putchar ('\n');
 }
 
 static void