From dc20b0f9f5c0a3c1c4f7077d4015d914094f3c1a Mon Sep 17 00:00:00 2001 From: proski Date: Sat, 7 Jun 2008 04:30:22 +0000 Subject: [PATCH] 2008-06-07 Pavel Roskin * util/biosdisk.c (open_device): Revert last change to the function, it broke installation. The sector needs to be different dependent on which device is opened. --- ChangeLog | 6 ++++++ util/biosdisk.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index d1485af22..0d8176af5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-07 Pavel Roskin + + * util/biosdisk.c (open_device): Revert last change to the + function, it broke installation. The sector needs to be + different dependent on which device is opened. + 2008-06-06 Robert Millan Ensure GRUB_KERNEL_MACHINE_DATA_END is always consistent with the diff --git a/util/biosdisk.c b/util/biosdisk.c index eb1f3ff9b..90df4f1ef 100644 --- a/util/biosdisk.c +++ b/util/biosdisk.c @@ -298,6 +298,9 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags) /* Make the buffer cache consistent with the physical disk. */ ioctl (fd, BLKFLSBUF, 0); + + if (is_partition) + sector -= disk->partition->start; } #else /* ! __linux__ */ fd = open (map[disk->id].device, flags);