From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 10 Jul 2011 14:06:31 +0000 (+0200)
Subject: 	* util/grub-install.in: Recognize ESP mounted at /boot/EFI.
X-Git-Tag: 2.00~1157
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca5572a9ad872fd26712d0fbae1ab63adc64787b;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index 84167f226..0b386157c 100644
--- 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 711c9c7e2..1e9e1a2fd 100644
--- 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.