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

* util/grub-install.in: Recognize ESP mounted at /boot/EFI.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-10 16:06:31 +02:00
parent e4bcf6258c
commit ca5572a9ad
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2011-07-10 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.in: Recognize ESP mounted at /boot/EFI.
2011-07-10 Vladimir Serbinenko <phcoder@gmail.com> 2011-07-10 Vladimir Serbinenko <phcoder@gmail.com>
* po/POTFILES.in: Regenerate. * po/POTFILES.in: Regenerate.

6
util/grub-install.in
View file

@ -335,6 +335,12 @@ if [ x"$platform" = xefi ]; then
if test "x$install_device" != "x`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${bootdir}"`"; then if test "x$install_device" != "x`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${bootdir}"`"; then
efidir="${bootdir}/efi" efidir="${bootdir}/efi"
fi fi
elif test -d "${bootdir}/EFI"; then
install_device="`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${bootdir}/EFI"`"
# Is it a mount point?
if test "x$install_device" != "x`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${bootdir}"`"; then
efidir="${bootdir}/EFI"
fi
elif test -n "$rootdir" && test "x$rootdir" != "x/"; then elif test -n "$rootdir" && test "x$rootdir" != "x/"; then
# The EFI System Partition may have been given directly using # The EFI System Partition may have been given directly using
# --root-directory. # --root-directory.