From: Andrey Borzenkov <arvidjaar@gmail.com>
To: The development of GNU GRUB <grub-devel@gnu.org>
Cc: grub-devel@iam.tj
Subject: Re: GRUB_ENABLE_CRYPTODISK vs GRUB_CRYPTODISK_ENABLE ?
Date: Fri, 27 Sep 2013 20:43:30 +0400 [thread overview]
Message-ID: <20130927204330.0e138519@opensuse.site> (raw)
In-Reply-To: <5245B023.6070100@iam.tj>
В Fri, 27 Sep 2013 17:19:47 +0100
TJ <grub-devel@iam.tj> пишет:
> 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 <arvidjaar@gmail.com>
To: grub-devel@gnu.org
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 <arvidjaar@gmail.com>
---
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)
next prev parent reply other threads:[~2013-09-27 16:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-29 12:43 GRUB_CRYPTODISK_ENABLE undocumented Andrey Borzenkov
2013-08-28 7:04 ` Michael Chang
2013-09-24 10:39 ` Andrey Borzenkov
2013-09-24 11:10 ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-09-27 16:19 ` GRUB_ENABLE_CRYPTODISK vs GRUB_CRYPTODISK_ENABLE ? TJ
2013-09-27 16:43 ` Andrey Borzenkov [this message]
2013-08-28 7:05 ` GRUB_CRYPTODISK_ENABLE undocumented Michael Chang
2013-08-28 14:51 ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-08-29 7:37 ` Michael Chang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130927204330.0e138519@opensuse.site \
--to=arvidjaar@gmail.com \
--cc=grub-devel@gnu.org \
--cc=grub-devel@iam.tj \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).