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

* util/grub-install.in: Move cryptodisk logic to appropriate place.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-08-23 11:18:00 +02:00
parent ab178c084a
commit 4155e6974a
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2011-08-23 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.in: Move cryptodisk logic to appropriate place.
2011-08-21 Szymon Janc <szymon@janc.net.pl> 2011-08-21 Szymon Janc <szymon@janc.net.pl>
* acinclude.m4: Use AC_LANG_PROGRAM macro to generate source code for * acinclude.m4: Use AC_LANG_PROGRAM macro to generate source code for

13
util/grub-install.in
View file

@ -558,11 +558,6 @@ if [ "x${devabstraction_module}" = "x" ] ; then
exit 1 exit 1
fi fi
if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
for uuid in "`"${grub_probe}" --device "${device}" --target=cryptodisk_uuid`"; do
echo "cryptomount -u $uuid"
done
fi
echo "search.fs_uuid ${uuid} root " >> "${grubdir}/load.cfg" echo "search.fs_uuid ${uuid} root " >> "${grubdir}/load.cfg"
echo 'set prefix=($root)'"${relative_grubdir}" >> "${grubdir}/load.cfg" echo 'set prefix=($root)'"${relative_grubdir}" >> "${grubdir}/load.cfg"
@ -577,6 +572,14 @@ if [ "x${devabstraction_module}" = "x" ] ; then
fi fi
fi fi
else else
if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
for uuid in "`"${grub_probe}" --device "${grub_device}" --target=cryptodisk_uuid`"; do
echo "cryptomount -u $uuid" >> "${grubdir}/load.cfg"
done
fi
config_opt="-c ${grubdir}/load.cfg "
prefix_drive=`"$grub_probe" --device-map="${device_map}" --target=drive --device "${grub_device}"` || exit 1 prefix_drive=`"$grub_probe" --device-map="${device_map}" --target=drive --device "${grub_device}"` || exit 1
fi fi