Re: GRUB_ENABLE_CRYPTODISK vs GRUB_CRYPTODISK_ENABLE ?

[Andrey Borzenkov]

В Fri, 27 Sep 2013 17:19:47 +0100
TJ <address@hidden> пишет:

> What is the difference between GRUB_ENABLE_CRYPTODISK and 
> GRUB_CRYPTODISK_ENABLE?
> 
> GRUB_ENABLE_CRYPTODISK only seems to be used in an export in 
> "util/grub-mkconfig.in" whereas GRUB_CRYPTODISK_ENABLE is used in 
> "util/grub-{install,mkconfig_lib}.in".
> 
> On Ubuntu 13.10 at least I found that I had to edit the export in 
> 'grub-mkconfig' to be GRUB_CRYPTODISK_ENABLE in order for the installer 
> scripts to correctly install for whole-disk encryption.
> 
> Unless there's some Makefile or pre-processor magic going on which I've 
> missed I believe this might be a bug.
> 


Looks like it.

From: Andrey Borzenkov <address@hidden>
To: address@hidden
Subject: [PATCH] consistently use GRUB_ENABLE_CRYPTODISK everywhere

Both GRUB_ENABLE_CRYPTODISK and GRUB_CRYPTODISK_ENABLE
were used in different places. Use GRUB_ENABLE_CRYPTODISK everywhere
for consistency with other GRUB_ENABLE_* or GRUB_DISABLE_* parameters.

Signed-off-by: Andrey Borzenkov <address@hidden>

---
 util/grub-install.in      | 2 +-
 util/grub-mkconfig_lib.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/grub-install.in b/util/grub-install.in
index ce8f840..7cd089b 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 016d8c5..98d8a77 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
-- 
tg: (144214a..) u/grub_cryptodisk_enable (depends on: master)