From cba416eb0d097b1c5abec163d8fd9c78dfe3ed4a Mon Sep 17 00:00:00 2001 From: robertmh Date: Mon, 13 Apr 2009 14:38:10 +0000 Subject: [PATCH] 2009-04-13 Robert Millan * 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. --- ChangeLog | 5 +++++ loader/i386/linux.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0220dd15a..d57317846 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-13 Robert Millan + + * 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 * 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 01d10d598..19444f4b8 100644 --- 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);