From: Vladimir 'phcoder' Serbinenko Date: Wed, 29 Sep 2010 20:45:57 +0000 (+0200) Subject: * grub-core/boot/i386/pc/lnxboot.S: Replace X-Git-Tag: 1.99~413 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edde54e656a3219a6ad5e7118e0212d50af01697;p=thirdparty%2Fgrub.git * grub-core/boot/i386/pc/lnxboot.S: Replace GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE with GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART. --- diff --git a/ChangeLog b/ChangeLog index fe48dc277..91049acdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-09-29 Vladimir Serbinenko + + * grub-core/boot/i386/pc/lnxboot.S: Replace + GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE with + GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART. + 2010-09-29 Vladimir Serbinenko Write embedding zone using Reed-Solomon. diff --git a/grub-core/boot/i386/pc/lnxboot.S b/grub-core/boot/i386/pc/lnxboot.S index 9348553c3..9a599c261 100644 --- a/grub-core/boot/i386/pc/lnxboot.S +++ b/grub-core/boot/i386/pc/lnxboot.S @@ -185,7 +185,7 @@ real_code_2: call LOCAL(move_memory) /* Check for multiboot signature. */ - cmpl $MULTIBOOT_HEADER_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE) + cmpl $MULTIBOOT_HEADER_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART) jz 1f movl (ramdisk_image - start), %esi