[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5340/8267] wic: fix generation of partition UUID

[Emmanuele Bassi <ebassi src gnome org>]

commit 871363251a2de8fd701e80f711fbd3770dbf992e
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Sun Mar 26 18:28:04 2017 +0300

    wic: fix generation of partition UUID
    
    Partition UUID for msdos partitioning is based on a 4 bytes long
    system identifier. Wic uses random number to generate system
    identifier. For the numbers starting with 0 partition uuid is
    shorter, which makes wic images non-bootable as kernel expects
    8 charactest in PARTUUID parameter.
    
    Padded system identifier with '0' when generating partition UUID
    to make it always 8 characters long. This should fix the boot
    issue.
    
    (From OE-Core rev: bdaba95af2b2c9174311374436f184d2a927f6f1)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/imager/direct.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 7d38ab3..67fd183 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -323,7 +323,7 @@ class PartitionedImage():
                 if self.ptable_format == 'gpt':
                     part.uuid = str(uuid.uuid4())
                 else: # msdos partition table
-                    part.uuid = '%0x-%02d' % (self.identifier, part.realnum)
+                    part.uuid = '%08x-%02d' % (self.identifier, part.realnum)
 
     def prepare(self, imager):
         """Prepare an image. Call prepare method of all image partitions."""