Revision: 2276
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2276
Author: robertmh
Date: 2009-06-08 16:12:58 +0000 (Mon, 08 Jun 2009)
Log Message:
-----------
2009-06-08 Robert Millan <[email protected]>
* loader/i386/linux.c (grub_cmd_linux): When processing `vga=', use
as fallback an equivalent option without depth.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/loader/i386/linux.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-06-08 13:29:05 UTC (rev 2275)
+++ trunk/grub2/ChangeLog 2009-06-08 16:12:58 UTC (rev 2276)
@@ -1,3 +1,8 @@
+2009-06-08 Robert Millan <[email protected]>
+
+ * loader/i386/linux.c (grub_cmd_linux): When processing `vga=', use
+ as fallback an equivalent option without depth.
+
2009-06-08 Vladimir Serbinenko <[email protected]>
Not fail if unable to retrieve C/H/S on LBA disks
Modified: trunk/grub2/loader/i386/linux.c
===================================================================
--- trunk/grub2/loader/i386/linux.c 2009-06-08 13:29:05 UTC (rev 2275)
+++ trunk/grub2/loader/i386/linux.c 2009-06-08 16:12:58 UTC (rev 2276)
@@ -761,17 +761,19 @@
break;
}
- buf = grub_malloc (20);
+ buf = grub_malloc (sizeof ("WWWWxHHHHxDD;WWWWxHHHH"));
if (! buf)
goto fail;
linux_mode
= &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START];
- grub_sprintf (buf, "%dx%dx%d",
+ grub_sprintf (buf, "%ux%ux%u;%ux%u",
linux_vesafb_res[linux_mode->res_index].width,
linux_vesafb_res[linux_mode->res_index].height,
- linux_mode->depth);
+ linux_mode->depth,
+ linux_vesafb_res[linux_mode->res_index].width,
+ linux_vesafb_res[linux_mode->res_index].height);
grub_printf ("%s is deprecated. "
"Use set gfxpayload=%s before "
"linux command instead.\n",
