2009-06-08 Robert Millan <rmh.grub@aybabtu.com>

* loader/i386/linux.c (grub_cmd_linux): When processing `vga=', use
        as fallback an equivalent option without depth.
This commit is contained in:
robertmh 2009-06-08 16:12:58 +00:00
parent de65ee2b2c
commit 9e172e3066
2 changed files with 10 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2009-06-08 Robert Millan <rmh.grub@aybabtu.com>
* loader/i386/linux.c (grub_cmd_linux): When processing `vga=', use
as fallback an equivalent option without depth.
2009-06-08 Vladimir Serbinenko <phcoder@gmail.com> 2009-06-08 Vladimir Serbinenko <phcoder@gmail.com>
Not fail if unable to retrieve C/H/S on LBA disks Not fail if unable to retrieve C/H/S on LBA disks

View file

@ -761,17 +761,19 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
break; break;
} }
buf = grub_malloc (20); buf = grub_malloc (sizeof ("WWWWxHHHHxDD;WWWWxHHHH"));
if (! buf) if (! buf)
goto fail; goto fail;
linux_mode linux_mode
= &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START]; = &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].width,
linux_vesafb_res[linux_mode->res_index].height, 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. " grub_printf ("%s is deprecated. "
"Use set gfxpayload=%s before " "Use set gfxpayload=%s before "
"linux command instead.\n", "linux command instead.\n",