summaryrefslogtreecommitdiffstats
path: root/master/debian/probe_canonicalise.patch
diff options
context:
space:
mode:
Diffstat (limited to 'master/debian/probe_canonicalise.patch')
-rw-r--r--master/debian/probe_canonicalise.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/master/debian/probe_canonicalise.patch b/master/debian/probe_canonicalise.patch
new file mode 100644
index 0000000..ba40995
--- /dev/null
+++ b/master/debian/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);