From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 12 Oct 2013 06:17:05 +0000 (+0200)
Subject: 	Fix inconsistent use of GRUB_CRYPTODISK_ENABLE and
X-Git-Tag: grub-2.02-beta1~720
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cd3c4fec783558b079df32f8d652e7ce97e9cdc;p=thirdparty%2Fgrub.git

	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 15a44817c..cafb6494e 100644
--- 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 ce8f84019..7cd089bfd 100644
--- 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 016d8c51b..98d8a7706 100644
--- 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