From 4e7399859b072f4e86c92225339d7a9310baa526 Mon Sep 17 00:00:00 2001 From: okuji Date: Sat, 25 Nov 2006 03:21:29 +0000 Subject: [PATCH] 2006-11-25 Yoshinori K. Okuji * util/i386/pc/grub-mkimage.c (generate_image): Fix the offset of the number of sectors. Reported by Andrey Shuvikov . --- ChangeLog | 6 ++++++ THANKS | 1 + util/i386/pc/grub-mkimage.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d4260057..ee79af72b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-11-25 Yoshinori K. Okuji + + * util/i386/pc/grub-mkimage.c (generate_image): Fix the offset of + the number of sectors. Reported by Andrey Shuvikov + . + 2006-11-11 Jeroen Dekkers * kern/disk.c (grub_disk_read): When there is a read error, always diff --git a/THANKS b/THANKS index 1c7abfb11..d43d6db72 100644 --- a/THANKS +++ b/THANKS @@ -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 generally assist in the GRUB 2 maintainership process: +Andrey Shuvikov Bibo Mao Guillem Jover Harley D. Eades III diff --git a/util/i386/pc/grub-mkimage.c b/util/i386/pc/grub-mkimage.c index 3cd1d589d..8bb3ea8bf 100644 --- a/util/i386/pc/grub-mkimage.c +++ b/util/i386/pc/grub-mkimage.c @@ -1,7 +1,7 @@ /* grub-mkimage.c - make a bootable image */ /* * 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 * 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. */ *((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_util_write_image (boot_img, boot_size, out);