[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2914/8267] wic: set PARTUUID only for gpt partition table

[Emmanuele Bassi <ebassi src gnome org>]

commit e8ce5083c54e3cece55702c4433601bdcbf9ccc3
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Oct 6 13:33:35 2016 +0300

    wic: set PARTUUID only for gpt partition table
    
    sgdisk fails to set PARTUUID for msdos partitions as it's only
    supported for GPT partitions.
    
    Checked partition table format to run sgdisk --partition-guid
    only for GPT partitions.
    
    (From OE-Core rev: 0c1804821917d6d3a062ca19b63667d030138f21)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/utils/partitionedfs.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index cafb933..8d93a68 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -299,7 +299,7 @@ class Image():
                                          (part['num'], part['part_type'],
                                           disk['disk'].device), self.native_sysroot)
 
-            if part['uuid']:
+            if part['uuid'] and disk['ptable_format'] == "gpt":
                 msger.debug("partition %d: set UUID to %s" % \
                             (part['num'], part['uuid']))
                 exec_native_cmd("sgdisk --partition-guid=%d:%s %s" % \