* util/grub-install.c (update_nvram): Support --no-nvram flag

	for EFI targets.

diff --git a/ChangeLog b/ChangeLog
index 5dc67eeeb45d5d2b3e5d40c75b958c7c45a163de..cf851308131f2e2bcdbf8649b64712e88612ccf8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-23  Keshav Padram Amburay <the.ridikulus.rat@gmail.com>
+
+       * util/grub-install.c (update_nvram): Support --no-nvram flag
+       for EFI targets.
+
 2013-11-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * INSTALL: Add note about sparc64/ia64 with clang (unsupported).

diff --git a/util/grub-install.c b/util/grub-install.c
index 482317abd96ec96ad5f768f3a795396ab08559a2..5354a6d84200fb34dc11cd102459af47828793fc 100644 (file)
--- 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,
@@ -1522,7 +1522,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;