aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-06-05 10:17:12 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:55:39 +0100
commite4bc71fa78b0d7a60aa85b8eb09a053545b61b84 (patch)
tree08c4354fecd389b22032578c0ec5e6db109c262d
parent4a303007149ea1205bbd454e70810e7dfa343d4c (diff)
downloadopenembedded-core-contrib-e4bc71fa78b0d7a60aa85b8eb09a053545b61b84.tar.gz
wic: Add parameter 'uuid' to Image.add_partition method
With this parameter it's possible to pass generated UUID into Image class to set it for partition when it's created. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--scripts/lib/wic/imager/direct.py3
-rw-r--r--scripts/lib/wic/utils/partitionedfs.py5
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 36150c9ad3..2290ecd07d 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -272,7 +272,8 @@ class DirectImageCreator(BaseImageCreator):
boot=p.active,
align=p.align,
no_table=p.no_table,
- part_type=p.part_type)
+ part_type=p.part_type,
+ uuid=p.uuid)
self._restore_fstab(fstab)
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 902548fbf8..a6e2e4f233 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -86,7 +86,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):
+ part_type=None, uuid=None):
""" Add the next partition. Prtitions have to be added in the
first-to-last order. """
@@ -110,7 +110,8 @@ class Image(object):
'boot': boot, # Bootable flag
'align': align, # Partition alignment
'no_table' : no_table, # Partition does not appear in partition table
- 'part_type' : part_type} # Partition type
+ 'part_type' : part_type, # Partition type
+ 'uuid': uuid} # Partition UUID
self.__add_partition(part)