From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VPb8o-0006Y7-Jj for mharc-grub-devel@gnu.org; Fri, 27 Sep 2013 12:43:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPb8j-0006Ru-C9 for grub-devel@gnu.org; Fri, 27 Sep 2013 12:43:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPb8f-0002vX-9h for grub-devel@gnu.org; Fri, 27 Sep 2013 12:43:37 -0400 Received: from mail-la0-x233.google.com ([2a00:1450:4010:c03::233]:43105) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPb8f-0002v8-1N for grub-devel@gnu.org; Fri, 27 Sep 2013 12:43:33 -0400 Received: by mail-la0-f51.google.com with SMTP id es20so2380361lab.38 for ; Fri, 27 Sep 2013 09:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=zMHP76d+sbrj23Ntro0HTPb0t0i8I3vO0hrQqQ0RLiM=; b=uiz3FIjBovPBZ5xNMHJfEs01IrXahHgGDoxGMgA5YXDTqf5JH57ZckJnk2MeEZz9WF m/FFM18qK01sFoxrQftCzvByWxJuVIEJbmIMO3pHxGoRcY8rC2XlNBdwKJAnYg9YyJxd gjlDNnlmt+yKzRULrhlgwuBPQI1ItbIPmM4W0FjWBvDLZvT41wCbO3sBM40O+U7YsJlh KeHtAbIvmG6Vth5k/+dV5EY4jkPBkLEkzY2k5wknmtheHXmorOMUEgdiPbDgkGPqEwSM pRQcG+FDkOBJGVQ0N6jjVDHp4Thh95pPOJ0ZJulS2GZ/4j5KKzGlSUyznJeFf2gzPPsX YWPQ== X-Received: by 10.112.9.195 with SMTP id c3mr2807736lbb.33.1380300211457; Fri, 27 Sep 2013 09:43:31 -0700 (PDT) Received: from opensuse.site (ppp91-76-150-246.pppoe.mtu-net.ru. [91.76.150.246]) by mx.google.com with ESMTPSA id ac2sm6378208lbc.10.1969.12.31.16.00.00 (version=SSLv3 cipher=RC4-SHA bits=128/128); Fri, 27 Sep 2013 09:43:30 -0700 (PDT) Date: Fri, 27 Sep 2013 20:43:30 +0400 From: Andrey Borzenkov To: The development of GNU GRUB Subject: Re: GRUB_ENABLE_CRYPTODISK vs GRUB_CRYPTODISK_ENABLE ? Message-ID: <20130927204330.0e138519@opensuse.site> In-Reply-To: <5245B023.6070100@iam.tj> References: <20130329164335.6d89ab0a@opensuse.site> <20130924143933.2f133939@opensuse.site> <5241732F.1090100@gmail.com> <5245B023.6070100@iam.tj> X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.18; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::233 Cc: grub-devel@iam.tj X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Sep 2013 16:43:41 -0000 В Fri, 27 Sep 2013 17:19:47 +0100 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 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 --- 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)