* Backport from upstream:

- Canonicalise the path argument to grub-probe (closes: #637768).

debian/changelog

@@ -1,8 +1,13 @@
 grub2 (1.99-12) UNRELEASED; urgency=low
 
+  [ Robert Millan ]
   * Fix grub-probe detection for LSI MegaRAID SAS devices on kFreeBSD.
     - kfreebsd_mfi_devices.diff
 
+  [ Colin Watson ]
+  * Backport from upstream:
+    - Canonicalise the path argument to grub-probe (closes: #637768).
+
  -- Robert Millan <rmh@debian.org>  Wed, 10 Aug 2011 22:34:10 +0200
 
 grub2 (1.99-11) unstable; urgency=low

debian/patches/probe_canonicalise.patch

@@ -0,0 +1,26 @@
+Description: Canonicalise path argument to grub-probe
+ This fixes use of "/path/.." as in grub-install for EFI, as well as
+ handling symlinks correctly.
+Author: Mario Limonciello <mario_limonciello@dell.com>
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Debian: http://bugs.debian.org/637768
+Forwarded: yes
+Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3401
+Last-Update: 2011-08-15
+
+Index: b/util/grub-probe.c
+===================================================================
+--- a/util/grub-probe.c
++++ b/util/grub-probe.c
+@@ -108,7 +108,10 @@
+ #endif
+     }
+   else
+-    device_name = grub_guess_root_device (path);
++    {
++      grub_path = canonicalize_file_name (path);
++      device_name = grub_guess_root_device (grub_path);
++    }
+ 
+   if (! device_name)
+     grub_util_error ("cannot find a device for %s (is /dev mounted?)", path);

debian/patches/series

@@ -25,3 +25,4 @@ gfxterm_background.patch
 zfs_packed_la_array.patch
 xen_replace.patch
 kfreebsd_mfi_devices.diff
+probe_canonicalise.patch