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

* Makefile.util.def (libgrub.a): Move grub-core/kern/emu/hostfs.c

Browse source 
and grub-core/disk/host.c to ...
(grub-fstest): ... here.  Having the host disk implementation
present confuses grub-probe and other utility programs.
* util/grub-mkconfig.in: Only verify readability of grub.cfg.new
when writing to a file, not when writing to stdout.
This commit is contained in:
Colin Watson 2010-09-09 17:17:45 +01:00
parent 8901b00c88
commit b6a690eeb8
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/grub-mkconfig.in
View file

@ -304,9 +304,11 @@ for i in ${grub_mkconfig_dir}/* ; do
done
# Verify readability of ${grub_cfg}.new
if is_path_readable_by_grub ${grub_cfg}.new ; then : ; else
echo "GRUB is unable to read ${grubdir}/${file}" >&2
exit 1
if test "x${grub_cfg}" != "x"; then
if is_path_readable_by_grub ${grub_cfg}.new ; then : ; else
echo "GRUB is unable to read ${grubdir}/${file}" >&2
exit 1
fi
fi
if test "x${grub_cfg}" != "x" ; then