* 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 c22a9e9b49fb0c4e0b82599365ce6fc67ad79cff..95324644b700ff03f0bb697f77554daf72050e85 100644 (file)
--- 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 04f32a14695d078ac3b101515f789ec7d9a9e4e0..5e3c5d8637a2790d61472cec16cf3dc4ed6aa60f 100644 (file)
--- 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)