2009-04-13 Robert Millan <rmh@aybabtu.com>

        * loader/i386/linux.c (grub_cmd_linux): Don't pass `vga=ask' parameter
        to Linux, simply abort telling the user it's no longer supported.

diff --git a/ChangeLog b/ChangeLog
index 0220dd15a39c0aca520d225f5fff4599d6d58aab..d5731784616d13bab31a71ac48588c7557271b44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-13  Robert Millan  <rmh@aybabtu.com>
+
+       * loader/i386/linux.c (grub_cmd_linux): Don't pass `vga=ask' parameter
+       to Linux, simply abort telling the user it's no longer supported.
+
 2009-04-13  Felix Zielcke  <fzielcke@z-51.de>
 
        * util/grub.d/10_freebsd.in: Don't exit if /boot/devices.hints

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 01d10d598963ecbe9c59faf203709ff4e4d65ca1..19444f4b8eda6f26386da85d5d46fe0f455cfcf1 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -583,7 +583,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        else if (grub_strcmp (val, "ext") == 0)
          vid_mode = GRUB_LINUX_VID_MODE_EXTENDED;
        else if (grub_strcmp (val, "ask") == 0)
-         vid_mode = GRUB_LINUX_VID_MODE_ASK;
+         {
+           grub_error (GRUB_ERR_BAD_ARGUMENT, "Legacy `ask' parameter no longer supported.");
+           goto fail;
+         }
        else
          vid_mode = (grub_uint16_t) grub_strtoul (val, 0, 0);