From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Tue, 17 Dec 2013 15:02:36 +0000 (+0100)
Subject: 	Update Mac code to match new register_efi prototype.
X-Git-Tag: grub-2.02-beta1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d218ec97388b69854a5c75d9548943e945deb578;p=thirdparty%2Fgrub.git

	Update Mac code to match new register_efi prototype.
---

diff --git a/ChangeLog b/ChangeLog
index c75b86f33..d0746fb8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Update Mac code to match new register_efi prototype.
+
 2013-12-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Implement better integration with Mac firmware.
diff --git a/util/grub-install.c b/util/grub-install.c
index 9bc0b163e..5deabe838 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1811,13 +1811,8 @@ main (int argc, char *argv[])
 	  bless (ins_dev, boot_efi, 1);
 	  if (!removable && update_nvram)
 	    {
-	      char * efidir_disk;
-	      int efidir_part;
-
 	      /* Try to make this image bootable using the EFI Boot Manager, if available.  */
-	      efidir_disk = grub_util_get_os_disk (efidir_device_names[0]);
-	      efidir_part = efidir_grub_dev->disk->partition ? efidir_grub_dev->disk->partition->number + 1 : 1;
-	      grub_install_register_efi (efidir_disk, efidir_part,
+	      grub_install_register_efi (efidir_grub_dev,
 					 "\\System\\Library\\CoreServices",
 					 efi_distributor);
 	    }