summaryrefslogtreecommitdiffstats
path: root/master/debian/userland-part.patch
diff options
context:
space:
mode:
Diffstat (limited to 'master/debian/userland-part.patch')
-rw-r--r--master/debian/userland-part.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/master/debian/userland-part.patch b/master/debian/userland-part.patch
index 16d2156..6502885 100644
--- a/master/debian/userland-part.patch
+++ b/master/debian/userland-part.patch
@@ -5,9 +5,11 @@ Forwarded: not-needed
Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/4290
Last-Update: 2012-06-08
---- a/grub-core/kern/emu/getroot.c 2012-05-03 20:59:16 +0000
-+++ b/grub-core/kern/emu/getroot.c 2012-05-03 21:41:46 +0000
-@@ -337,6 +337,75 @@
+diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c
+index 7970e35..fe62c6e 100644
+--- a/grub-core/kern/emu/getroot.c
++++ b/grub-core/kern/emu/getroot.c
+@@ -337,6 +337,75 @@ grub_find_device (const char *dir __attribute__ ((unused)),
#elif defined (__GNU__)
@@ -83,7 +85,7 @@ Last-Update: 2012-06-08
#elif ! defined(__CYGWIN__)
char *
-@@ -565,61 +634,8 @@
+@@ -565,61 +634,8 @@ grub_guess_root_device (const char *dir)
{
char *os_dev = NULL;
#ifdef __GNU__