2008-10-29 Robert Millan <rmh@aybabtu.com>
* util/i386/pc/grub-install.in: Handle empty string as output from make_system_path_relative_to_its_root().
This commit is contained in:
parent
1b7748eb13
commit
7ab28c2157
2 changed files with 10 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
2008-10-29 Robert Millan <rmh@aybabtu.com>
|
||||
|
||||
* util/i386/pc/grub-install.in: Handle empty string as output from
|
||||
make_system_path_relative_to_its_root().
|
||||
|
||||
2008-10-05 Hans Lambermont <hans@lambermont.dyndns.org>
|
||||
|
||||
* disk/lvm.c (grub_lvm_scan_device): Allocate buffer space for the
|
||||
|
|
|
@ -261,9 +261,12 @@ else
|
|||
prefix_drive=`$grub_probe --target=drive --device ${grub_device}`
|
||||
fi
|
||||
|
||||
grub_prefix="${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}`" || exit 1
|
||||
relative_grubdir=`make_system_path_relative_to_its_root ${grubdir}` || exit 1
|
||||
if [ "x${relative_grubdir}" = "x" ] ; then
|
||||
relative_grubdir=/
|
||||
fi
|
||||
|
||||
$grub_mkimage --output=${grubdir}/core.img --prefix=${grub_prefix} $modules || exit 1
|
||||
$grub_mkimage --output=${grubdir}/core.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
|
||||
|
||||
# Now perform the installation.
|
||||
$grub_setup ${setup_verbose} --directory=${grubdir} --device-map=${device_map} \
|
||||
|
|
Loading…
Reference in a new issue