From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Tue, 2 Jun 2015 14:02:00 +0000 (+0300)
Subject: wic: check if part_type is set only for msdos partition table
X-Git-Tag: 2015-10~1622
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=52dcccbead0c57d1a3f4afd2f9c7a38a985301ec;p=openembedded-core.git

wic: check if part_type is set only for msdos partition table

Specifying partition type(GUID) makes sense for gpt partition table.

Current code checks if part-type is specified and throws exception
if it is. This makes sense to do only for msdos partition table.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 06d4eac0e5..eacf2679d2 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -138,7 +138,7 @@ class Image:
                 raise ImageError("No disk %s for partition %s" \
                                  % (p['disk_name'], p['mountpoint']))
 
-            if p['part_type']:
+            if ptable_format == 'msdos' and p['part_type']:
                 # The --part-type can also be implemented for MBR partitions,
                 # in which case it would map to the 1-byte "partition type"
                 # filed at offset 3 of the partition entry.