2008-05-30 Robert Millan <rmh@aybabtu.com>

        * fs/ext2.c (grub_ext2_uuid): Use `04x' instead of '02x' as
        grub_printf() flags, since we're printing in units of 2 bytes.

diff --git a/ChangeLog b/ChangeLog
index 6d81bdfa791dbd5588f1d2765d4324354323e86a..60907540e2bf7ec80936e294362f3fbc5f54ec29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-30  Robert Millan  <rmh@aybabtu.com>
+
+       * fs/ext2.c (grub_ext2_uuid): Use `04x' instead of '02x' as
+        grub_printf() flags, since we're printing in units of 2 bytes.
+
 2008-05-30  Robert Millan  <rmh@aybabtu.com>
 
        * util/grub.d/00_header.in: Remove obsolete comment referencing

diff --git a/fs/ext2.c b/fs/ext2.c
index 3c22aec8bc0cfe9cd150e4ee7a1bcc72db320b84..ffe9e3356d4b138a9a54da8c3761f59bb3d68251 100644 (file)
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -886,7 +886,7 @@ grub_ext2_uuid (grub_device_t device, char **uuid)
   if (data)
     {
       *uuid = grub_malloc (40 + sizeof ('\0'));
-      grub_sprintf (*uuid, "%02x%02x-%02x-%02x-%02x-%02x%02x%02x",
+      grub_sprintf (*uuid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
                    grub_be_to_cpu16 (data->sblock.uuid[0]), grub_be_to_cpu16 (data->sblock.uuid[1]),
                    grub_be_to_cpu16 (data->sblock.uuid[2]), grub_be_to_cpu16 (data->sblock.uuid[3]),
                    grub_be_to_cpu16 (data->sblock.uuid[4]), grub_be_to_cpu16 (data->sblock.uuid[5]),