summaryrefslogtreecommitdiffstats
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:59:12 +0100
commit9f40e6a5e8cf069a0dcdcbca6f35a15736da3af0 (patch)
tree01d24ec8e3d0337ee9aae336113a9e24afb9e9d7
parentc3148c6199756439d1802555b45249066eb7e6cf (diff)
downloadpoky-9f40e6a5e8cf069a0dcdcbca6f35a15736da3af0.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. (From OE-Core rev: e4bc71fa78b0d7a60aa85b8eb09a053545b61b84) 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>
-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):
272 boot=p.active, 272 boot=p.active,
273 align=p.align, 273 align=p.align,
274 no_table=p.no_table, 274 no_table=p.no_table,
275 part_type=p.part_type) 275 part_type=p.part_type,
276 uuid=p.uuid)
276 277
277 self._restore_fstab(fstab) 278 self._restore_fstab(fstab)
278 279
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):
86 86
87 def add_partition(self, size, disk_name, mountpoint, source_file=None, fstype=None, 87 def add_partition(self, size, disk_name, mountpoint, source_file=None, fstype=None,
88 label=None, fsopts=None, boot=False, align=None, no_table=False, 88 label=None, fsopts=None, boot=False, align=None, no_table=False,
89 part_type=None): 89 part_type=None, uuid=None):
90 """ Add the next partition. Prtitions have to be added in the 90 """ Add the next partition. Prtitions have to be added in the
91 first-to-last order. """ 91 first-to-last order. """
92 92
@@ -110,7 +110,8 @@ class Image(object):
110 'boot': boot, # Bootable flag 110 'boot': boot, # Bootable flag
111 'align': align, # Partition alignment 111 'align': align, # Partition alignment
112 'no_table' : no_table, # Partition does not appear in partition table 112 'no_table' : no_table, # Partition does not appear in partition table
113 'part_type' : part_type} # Partition type 113 'part_type' : part_type, # Partition type
114 'uuid': uuid} # Partition UUID
114 115
115 self.__add_partition(part) 116 self.__add_partition(part)
116 117