Fix inconsistent use of GRUB_CRYPTODISK_ENABLE and

	GRUB_ENABLE_CRYPTODISK.

	* util/grub-install.in: Rename all GRUB_CRYPTODISK_ENABLE to
	GRUB_ENABLE_CRYPTODISK.
	* util/grub-mkconfig_lib.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 15a44817cdc5a221d75c93384e85555fbe184082..cafb6494efb14052419b6e9f646aae0abed103b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-12  Andrey Borzenkov <arvidjaar@gmail.com>
+
+       Fix inconsistent use of GRUB_CRYPTODISK_ENABLE and
+       GRUB_ENABLE_CRYPTODISK.
+
+       * util/grub-install.in: Rename all GRUB_CRYPTODISK_ENABLE to
+       GRUB_ENABLE_CRYPTODISK.
+       * util/grub-mkconfig_lib.in: Likewise.
+
 2013-10-12  Christian Cier-Zniewski <c.cier@gmx.de>
 
        * docs/grub.texi (Vendor power-on keys): Add Dell Latitude E4300.

diff --git a/util/grub-install.in b/util/grub-install.in
index ce8f8401955eab65e8e810128340754c264130b0..7cd089bfd32fffd1c5096eb936227ba4ed1f1841 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -632,7 +632,7 @@ if [ "x${devabstraction_module}" = "x" ] ; then
        fi
     fi
 else
-    if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
+    if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then
        for uuid in "`echo "${grub_device}" | xargs "${grub_probe}"  --target=cryptodisk_uuid --device`"; do
            echo "cryptomount -u $uuid" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
        done

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 016d8c51b595c7e9b13db874e5d0689080753285..98d8a77060dc1b44d552e0bc16930d1200e78ac7 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -71,7 +71,7 @@ is_path_readable_by_grub ()
     return 1
   fi
 
-  if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
+  if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then
       return 0
   fi
   
@@ -138,7 +138,7 @@ prepare_grub_to_access_device ()
     echo "insmod ${module}"
   done
 
-  if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
+  if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then
       for uuid in "`"${grub_probe}" --device "$@" --target=cryptodisk_uuid`"; do
          echo "cryptomount -u $uuid"
       done