From e4bc71fa78b0d7a60aa85b8eb09a053545b61b84 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 5 Jun 2015 10:17:12 +0300 Subject: 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 Signed-off-by: Ross Burton --- scripts/lib/wic/imager/direct.py | 3 ++- scripts/lib/wic/utils/partitionedfs.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts') 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) -- cgit v1.2.3