commit 307c6b4440562245d2adfcc585b4175ef9c61260
Author: Keshav Padram Amburay <address@hidden>
Date:   Fri Nov 22 00:26:37 2013 +0530

    * util/grub-install.c (update_nvram): Support --no-nvram flag
    in EFI targets to prevent grub-install from creating entry using
    efibootmgr in non-removable EFI installs

diff --git a/ChangeLog b/ChangeLog
index 6d4b5b2..e54674b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-22  Keshav Padram Amburay <address@hidden>
+
+	* util/grub-install.c (update_nvram): Support --no-nvram flag
+	in EFI targets to prevent grub-install from creating entry using
+	efibootmgr in non-removable EFI installs
+
 2013-11-21  Colin Watson  <address@hidden>
 
 	* util/grub-mkrescue.c (main): If a source directory is not
diff --git a/util/grub-install.c b/util/grub-install.c
index 78e9a04..72e8957 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -233,7 +233,7 @@ static struct argp_option options[] = {
       "This option is only available on BIOS target."), 2},
   {"no-nvram", OPTION_NO_NVRAM, 0, 0,
    N_("don't update the `boot-device' NVRAM variable. "
-      "This option is only available on IEEE1275 targets."), 2},
+      "This option is only available on EFI and IEEE1275 targets."), 2},
   {"skip-fs-probe",'s',0,      0,
    N_("do not probe for filesystems in DEVICE"), 0},
   {"no-bootsector", OPTION_NO_BOOTSECTOR, 0, 0,
@@ -1509,7 +1509,7 @@ main (int argc, char *argv[])
 	grub_install_copy_file (imgfile, dst, 1);
 	free (dst);
       }
-      if (!removable)
+      if (!removable && update_nvram)
 	{
 	  char * efidir_disk;
 	  int efidir_part;