From b4232041534a79236eb8d8ab5c0024a0ef4da649 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 8 Aug 2014 13:28:54 -0500 Subject: wic: Update/rename install-related code The wic code inherited a basic image-creation flow based on installing packages, but wic doesn't actually install anything, so rename parts of the code dealing with installing to something more appropriate. Signed-off-by: Tom Zanussi --- scripts/lib/mic/utils/partitionedfs.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'scripts/lib/mic/utils/partitionedfs.py') diff --git a/scripts/lib/mic/utils/partitionedfs.py b/scripts/lib/mic/utils/partitionedfs.py index 43a38a9b14..2f950a69d4 100644 --- a/scripts/lib/mic/utils/partitionedfs.py +++ b/scripts/lib/mic/utils/partitionedfs.py @@ -309,11 +309,11 @@ class PartitionedMount: except: pass - def __install_partition(self, num, source_file, start, size): + def __write_partition(self, num, source_file, start, size): """ Install source_file contents into a partition. """ - if not source_file: # nothing to install + if not source_file: # nothing to write return # Start is included in the size so need to substract one from the end. @@ -325,7 +325,7 @@ class PartitionedMount: exec_cmd(dd_cmd) - def install(self, image_file): + def assemble(self, image_file): msger.debug("Installing partitions") self.image_file = image_file @@ -337,12 +337,12 @@ class PartitionedMount: # of the first _logical_ partition. This is why the extended # partition should start one sector before the first logical # partition. - self.__install_partition(p['num'], p['source_file'], - p['start'] - 1, - d['offset'] - p['start']) + self.__write_partition(p['num'], p['source_file'], + p['start'] - 1, + d['offset'] - p['start']) - self.__install_partition(p['num'], p['source_file'], - p['start'], p['size']) + self.__write_partition(p['num'], p['source_file'], + p['start'], p['size']) def create(self): for dev in self.disks.keys(): -- cgit v1.2.3