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

Integrate geli into autoconfiguration system

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-04-25 14:52:07 +02:00
parent d7bdab32b8
commit 20a409405b
13 changed files with 835 additions and 682 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/grub-mkconfig_lib.in
View file

@ -69,12 +69,12 @@ is_path_readable_by_grub ()
return 1
fi
if [ x$GRUB_LUKS_ENABLE = xy ]; then
if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
return 0
fi
for abstraction in $abstractions; do
if [ "x$abstraction" = xluks ]; then
if [ "x$abstraction" = xcryptodisk ]; then
return 1
fi
done
@ -138,9 +138,9 @@ prepare_grub_to_access_device ()
echo "insmod ${module}"
done
if [ x$GRUB_LUKS_ENABLE = xy ]; then
for uuid in "`"${grub_probe}" --device "${device}" --target=luks_uuid`"; do
echo "luksmount -u $uuid"
if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then
for uuid in "`"${grub_probe}" --device "${device}" --target=cryptodisk_uuid`"; do
echo "cryptomount -u $uuid"
done
fi