[gnome-continuous-yocto/gnomeostree-3.28-rocko: 31/8267] wic: add system_id argument to Image.add_partition

[Emmanuele Bassi <ebassi src gnome org>]

commit 514a87877e61d63626c21a61a1824c131031489d
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Fri Apr 22 12:32:02 2016 +0300

    wic: add system_id argument to Image.add_partition
    
    Added new argument to add_partition call to pass partition
    system id down the stack.
    
    [YOCTO #9096]
    
    (From OE-Core rev: f2733df697192c0010c17b7bbb02f8679cb8f313)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/imager/direct.py       |    3 ++-
 scripts/lib/wic/utils/partitionedfs.py |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index a1b4249..1937042 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -267,7 +267,8 @@ class DirectImageCreator(BaseImageCreator):
                                        align=part.align,
                                        no_table=part.no_table,
                                        part_type=part.part_type,
-                                       uuid=part.uuid)
+                                       uuid=part.uuid,
+                                       system_id=part.system_id)
 
         if fstab_path:
             shutil.move(fstab_path + ".orig", fstab_path)
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index ad596d2..9da4a7f 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -87,7 +87,7 @@ class Image(object):
 
     def add_partition(self, size, disk_name, mountpoint, source_file=None, fstype=None,
                       label=None, fsopts=None, boot=False, align=None, no_table=False,
-                      part_type=None, uuid=None):
+                      part_type=None, uuid=None, system_id=None):
         """ Add the next partition. Prtitions have to be added in the
         first-to-last order. """