Re: [RFC] Support for UEFI ESP in os-prober

[Andrey Borzenkov <arvidjaar@gmail.com>]

В Mon, 1 Oct 2012 13:25:50 +0200
"Vladimir 'phcoder' Serbinenko" <phcoder@gmail.com> пишет:

> I haven‘t had time to view in details but os-prober isn‘t managed by us but
> by debian-boot team so you need to contact them. Also I‘d prefer more of
> detection to be done on runtime than it‘s done in current model

In the meantime os-prober part is integrated in Debian as of 1.58.
The patch adds missing part from grub2 side. How does it look like?

---
 ChangeLog                   |  5 +++++
 util/grub.d/30_os-prober.in | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e9ef17e..798369d 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-30  Josh Triplett  <josh@joshtriplett.org>
 
 	* grub-core/normal/cmdline.c (grub_cmdline_get): Fix Ctrl-u
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 04f32a1..5e3c5d8 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -149,6 +149,22 @@ EOF
 }
 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)
       if [ "x$BTRFS" = "xbtrfs" ]; then
          LINUXPROBED="`linux-boot-prober btrfs ${BTRFSuuid} ${BTRFSsubvol}  2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
-- 
tg: (f434947..) u/os-prober-efi (depends on: master)