From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Fri, 31 May 2013 16:29:03 +0000 (+0400)
Subject: 	* util/grub.d/30_os-prober.in: Add support for probing EFI
X-Git-Tag: grub-2.02-beta1~982
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f25870887b7f758c8a66811bcda1f0e6e0e4521f;p=thirdparty%2Fgrub.git

	* util/grub.d/30_os-prober.in: Add support for probing EFI
	System Partition (as of os-prober 1.58).
---

diff --git a/ChangeLog b/ChangeLog
index c22a9e9b4..95324644b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-31  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* util/grub.d/30_os-prober.in: Add support for probing EFI
+	System Partition (as of os-prober 1.58).
+
 2013-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Add yet another path to unifont. For parabola.
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 04f32a146..5e3c5d863 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -147,6 +147,22 @@ EOF
       cat <<EOF
 	chainloader +1
 }
+EOF
+    ;;
+    efi)
+
+	EFIPATH=${DEVICE#*@}
+	DEVICE=${DEVICE%@*}
+	onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
+      cat << EOF
+menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-efi-$(grub_get_device_id "${DEVICE}")' {
+EOF
+      save_default_entry | sed -e "s/^/\t/"
+      prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
+
+      cat <<EOF
+	chainloader ${EFIPATH}
+}
 EOF
     ;;
     linux)