From 388a7c759375444d824faf072d81e3a5a1615a3e Mon Sep 17 00:00:00 2001 From: robertmh Date: Tue, 28 Jul 2009 21:40:34 +0000 Subject: [PATCH] 2009-07-28 Robert Millan * loader/i386/linux.c (grub_cmd_linux): Use ',' rather than ';' as separator for the suggested gfxpayload string (';' collides with the parser and needs escaping). --- ChangeLog | 6 ++++++ loader/i386/linux.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 23c288e98..c0bbc3197 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-07-28 Robert Millan + + * loader/i386/linux.c (grub_cmd_linux): Use ',' rather than ';' as + separator for the suggested gfxpayload string (';' collides with the + parser and needs escaping). + 2009-07-28 Vladimir Serbinenko * loader/i386/multiboot_helper.S (grub_multiboot_backward_relocator): diff --git a/loader/i386/linux.c b/loader/i386/linux.c index 78fa84822..d76e7fbd0 100644 --- a/loader/i386/linux.c +++ b/loader/i386/linux.c @@ -776,7 +776,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), linux_mode = &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START]; - grub_sprintf (buf, "%ux%ux%u;%ux%u", + 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,