* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_sectors) [__APPLE__]:

	Add blocksize retrieval.

diff --git a/ChangeLog b/ChangeLog
index 13e48acf97827644ceee6461801601d627806eb9..12a76b55142dc9de733e06b73208deaa10d0dfee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/emu/hostdisk.c (grub_util_get_fd_sectors) [__APPLE__]:
+       Add blocksize retrieval.
+
 2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * configure.ac: Restore CFLAGS after efiemu check.

diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 6c903d49595afc7ad13bee8fe23979f844f8851d..5b588a652d0a6a6eca151493cdd9dced7ecf2cb3 100644 (file)
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -283,6 +283,9 @@ grub_util_get_fd_sectors (int fd, const char *name, unsigned *log_secsize)
 # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     if (ioctl (fd, DIOCGSECTORSIZE, &sector_size))
       goto fail;
+# elif defined(__APPLE__)
+    if (ioctl (fd, DKIOCGETBLOCKSIZE, &sector_size))
+      goto fail;
 # elif defined(__sun__)
     sector_size = minfo.dki_lbsize;
 # elif defined(__NetBSD__)