2006-11-25 Yoshinori K. Okuji <okuji@enbug.org>

* util/i386/pc/grub-mkimage.c (generate_image): Fix the offset of
        the number of sectors.  Reported by Andrey Shuvikov
        <mr_hyro@yahoo.com>.
This commit is contained in:
okuji 2006-11-25 03:21:29 +00:00
parent 790707f254
commit 4e7399859b
3 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2006-11-25 Yoshinori K. Okuji <okuji@enbug.org>
* util/i386/pc/grub-mkimage.c (generate_image): Fix the offset of
the number of sectors. Reported by Andrey Shuvikov
<mr_hyro@yahoo.com>.
2006-11-11 Jeroen Dekkers <jeroen@dekkers.cx> 2006-11-11 Jeroen Dekkers <jeroen@dekkers.cx>
* kern/disk.c (grub_disk_read): When there is a read error, always * kern/disk.c (grub_disk_read): When there is a read error, always

1
THANKS
View file

@ -6,6 +6,7 @@ The following people made especially gracious contributions of their
time and energy in helping to track down bugs, add new features, and time and energy in helping to track down bugs, add new features, and
generally assist in the GRUB 2 maintainership process: generally assist in the GRUB 2 maintainership process:
Andrey Shuvikov <mr_hyro@yahoo.com>
Bibo Mao <bibo.mao@intel.com> Bibo Mao <bibo.mao@intel.com>
Guillem Jover <guillem@hadrons.org> Guillem Jover <guillem@hadrons.org>
Harley D. Eades III <hde@foobar-qux.org> Harley D. Eades III <hde@foobar-qux.org>

View file

@ -1,7 +1,7 @@
/* grub-mkimage.c - make a bootable image */ /* grub-mkimage.c - make a bootable image */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2002,2003,2004,2005 Free Software Foundation, Inc. * Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc.
* *
* GRUB is free software; you can redistribute it and/or modify * GRUB is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -143,7 +143,7 @@ generate_image (const char *dir, FILE *out, char *mods[])
/* i386 is a little endian architecture. */ /* i386 is a little endian architecture. */
*((grub_uint16_t *) (boot_img + GRUB_DISK_SECTOR_SIZE *((grub_uint16_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
- GRUB_BOOT_MACHINE_LIST_SIZE + 4)) - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
= grub_cpu_to_le16 (num); = grub_cpu_to_le16 (num);
grub_util_write_image (boot_img, boot_size, out); grub_util_write_image (boot_img, boot_size, out);