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

diff --git a/ChangeLog b/ChangeLog
index 84167f2266fdb0433f5fbc58d2c132687510e47f..0b386157c1dd3f9b3307d5222456d8bd83c56c3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * po/POTFILES.in: Regenerate.

diff --git a/util/grub-install.in b/util/grub-install.in
index 711c9c7e2464113b7aa345d76615c1e1bb27d43d..1e9e1a2fd367b462643cb014dbe76bfa926e130f 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -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
            efidir="${bootdir}/efi"
        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
         # The EFI System Partition may have been given directly using
         # --root-directory.