vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix inconsistent use of GRUB_CRYPTODISK_ENABLE and

Browse source 
GRUB_ENABLE_CRYPTODISK.

	* util/grub-install.in: Rename all GRUB_CRYPTODISK_ENABLE to
	GRUB_ENABLE_CRYPTODISK.
	* util/grub-mkconfig_lib.in: Likewise.
This commit is contained in:
Andrey Borzenkov 2013-10-12 08:17:05 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 78170f3e85
commit 4cd3c4fec7
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2013-10-12 Christian Cier-Zniewski <c.cier@gmx.de>
* docs/grub.texi (Vendor power-on keys): Add Dell Latitude E4300. * docs/grub.texi (Vendor power-on keys): Add Dell Latitude E4300.

2
util/grub-install.in
View file

@ -632,7 +632,7 @@ if [ "x${devabstraction_module}" = "x" ] ; then
fi fi
fi fi
else 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 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" echo "cryptomount -u $uuid" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
done done

4
util/grub-mkconfig_lib.in
View file

@ -71,7 +71,7 @@ is_path_readable_by_grub ()
return 1 return 1
fi fi
if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then
return 0 return 0
fi fi
@ -138,7 +138,7 @@ prepare_grub_to_access_device ()
echo "insmod ${module}" echo "insmod ${module}"
done 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 for uuid in "`"${grub_probe}" --device "$@" --target=cryptodisk_uuid`"; do
echo "cryptomount -u $uuid" echo "cryptomount -u $uuid"
done done