2009-07-28 Robert Millan <rmh.grub@aybabtu.com>

        * loader/i386/linux.c (grub_cmd_linux): Use ',' rather than ';' as
        separator for the suggested gfxpayload string (';' collides with the
        parser and needs escaping).

diff --git a/ChangeLog b/ChangeLog
index 23c288e98b04ce3fe8c94908aeae342d01f21138..c0bbc3197708f6a14a58baceb621b2f453e806bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-28  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * 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  <phcoder@gmail.com>
 
        * loader/i386/multiboot_helper.S (grub_multiboot_backward_relocator):

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 78fa848229cd332eb07b06beb73bedaa67772677..d76e7fbd0682bc3cb2bc3894898c4ab59a05c2ba 100644 (file)
--- 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,