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

* util/grub-install.in: ${imgext} won't be defined here until the

Browse source 
install branch is merged.  For the meantime, only verify core.img on
i386-pc and sparc64-ieee1275 platforms.
This commit is contained in:
Colin Watson 2010-09-10 13:47:16 +01:00
parent c38fe9f48e
commit c452fa66dd
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-09-10 Colin Watson <cjwatson@ubuntu.com>
* util/grub-install.in: ${imgext} won't be defined here until the
install branch is merged. For the meantime, only verify core.img on
i386-pc and sparc64-ieee1275 platforms.
2010-09-10 Robert Millan <rmh@gnu.org> 2010-09-10 Robert Millan <rmh@gnu.org>
Solaris support in grub_find_zpool_from_dir(). Thanks Solaris support in grub_find_zpool_from_dir(). Thanks

9
util/grub-install.in
View file

@ -402,7 +402,14 @@ case "${target_cpu}-${platform}" in
esac esac
# Verify readability of a few critical files # Verify readability of a few critical files
for file in grubenv core.${imgext} normal.mod ; do # verify_files is a temporary workaround; drop this once the install branch
# is merged.
verify_files=grubenv
if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]; then
verify_files="$verify_files core.img"
fi
verify_files="$verify_files normal.mod"
for file in $verify_files ; do
if is_path_readable_by_grub ${grubdir}/${file} ${grub_device} ${relative_grubdir}/${file} ; then : ; else if is_path_readable_by_grub ${grubdir}/${file} ${grub_device} ${relative_grubdir}/${file} ; then : ; else
echo "GRUB is unable to read ${grubdir}/${file}" >&2 echo "GRUB is unable to read ${grubdir}/${file}" >&2
exit 1 exit 1