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

Merge mainline into install

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-11 17:28:46 +02:00
commit 76e61597b4
25 changed files with 728 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/grub-install.in
View file

@ -527,9 +527,8 @@ if [ "x${devabstraction_module}" = "x" ] ; then
echo 'set prefix=($root)'"${relative_grubdir}" >> ${grubdir}/load.cfg
config_opt="-c ${grubdir}/load.cfg "
modules="$modules search_fs_uuid"
elif [ "x$platform" = xefi ]; then
# No grub-setup, so we need to hardcode the partition number in the
# core image's prefix.
elif [ "x$platform" = xefi ] || [ "x$platform" = xpc ]; then
# we need to hardcode the partition number in the core image's prefix.
prefix_drive="(,$grub_partition)"
fi
else
@ -562,7 +561,7 @@ elif [ "${target_cpu}-${platform}" = "i386-efi" ] || [ "${target_cpu}-${platform
fi
# Verify readability of a few critical files
for file in grubenv core.${imgext} normal.mod ; do
for file in grubenv normal.mod core.${imgext} ; do
if is_path_readable_by_grub ${grubdir}/${file} ${grub_device} ${relative_grubdir}/${file} ; then : ; else
echo "GRUB is unable to read ${grubdir}/${file}" >&2
exit 1