Merge lp:~ilya-yanok/ubuntu/precise/grub2/fix-for-948716 into lp:ubuntu/precise/grub2

[IlyaY]

[Colin Watson (cjwatson)]

Thanks! I'm going to merge this into Debian and then merge from there into Ubuntu, though, and I'll make sure that there's proper upstream attribution (using DEP-3 tags) along the way.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-06 18:42:33 +0000
+++ debian/changelog	2012-03-16 00:33:22 +0000
@@ -1,3 +1,10 @@
+grub2 (1.99-17ubuntu2) precise; urgency=low
+
+  * Backport from upstream:
+    - Make FAT UUID uppercase to match Linux (LP: #948716). 
+
+ -- Ilya Yanok <[e-mail]>  Fri, 16 Mar 2012 02:26:11 +0400
+
 grub2 (1.99-17ubuntu1) precise; urgency=low
 
   * Resynchronise with Debian.  Remaining changes:
 
=== added file 'debian/patches/backport_fat_uuid_fix.patch'
--- debian/patches/backport_fat_uuid_fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/backport_fat_uuid_fix.patch	2012-03-16 00:33:22 +0000
@@ -0,0 +1,17 @@
+Index: precise/grub-core/fs/fat.c
+===================================================================
+--- precise.orig/grub-core/fs/fat.c	2012-03-16 02:23:43.975818456 +0400
++++ precise/grub-core/fs/fat.c	2012-03-16 02:23:55.455818628 +0400
+@@ -836,9 +836,12 @@
+   data = grub_fat_mount (disk);
+   if (data)
+     {
++      char *ptr;
+       *uuid = grub_xasprintf ("%04x-%04x",
+ 			     (grub_uint16_t) (data->uuid >> 16),
+ 			     (grub_uint16_t) data->uuid);
++      for (ptr = *uuid; ptr && *ptr; ptr++)
++	*ptr = grub_toupper (*ptr);
+     }
+   else
+     *uuid = NULL;
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-06 14:06:58 +0000
+++ debian/patches/series	2012-03-16 00:33:22 +0000
@@ -58,3 +58,4 @@
 ubuntu_wubi_no_windows.patch
 ubuntu_probe_dmraid.patch
 ubuntu_qemu_no_kvm.patch
+backport_fat_uuid_fix.patch