diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-08-08 13:43:45 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:53:12 +0100 |
commit | 28453ae63cf00b1b23f0176241901cd1ad28d2e0 (patch) | |
tree | 5eb85409266c4ccc13d7d076cf5aa06a205e1ca9 | |
parent | d02c91fe4db69fa780d7d1924105446208a66819 (diff) | |
download | poky-28453ae63cf00b1b23f0176241901cd1ad28d2e0.tar.gz |
wic: Update/rename configure-related code
The wic code inherited a basic image-creation flow based on
image-configuration, but wic doesn't actually configure anything, so
rename parts of the code dealing with configuration to something more
appropriate.
(From OE-Core rev: 58dc8879bba31542e2386aaaa70034621b2b1e4e)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/mic/imager/direct.py | 7 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/imager/direct_plugin.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py index 8d7b6ee804..17bfd01566 100644 --- a/scripts/lib/mic/imager/direct.py +++ b/scripts/lib/mic/imager/direct.py | |||
@@ -284,12 +284,13 @@ class DirectImageCreator(BaseImageCreator): | |||
284 | % (disk_name, full_path, disk['min_size'])) | 284 | % (disk_name, full_path, disk['min_size'])) |
285 | self.__image.assemble(full_path) | 285 | self.__image.assemble(full_path) |
286 | 286 | ||
287 | def configure(self): | 287 | def finalize(self): |
288 | """ | 288 | """ |
289 | Configure the system image according to kickstart. | 289 | Finalize the disk image. |
290 | 290 | ||
291 | For now, it just prepares the image to be bootable by e.g. | 291 | For example, prepare the image to be bootable by e.g. |
292 | creating and installing a bootloader configuration. | 292 | creating and installing a bootloader configuration. |
293 | |||
293 | """ | 294 | """ |
294 | source_plugin = self.get_default_source_plugin() | 295 | source_plugin = self.get_default_source_plugin() |
295 | if source_plugin: | 296 | if source_plugin: |
diff --git a/scripts/lib/mic/plugins/imager/direct_plugin.py b/scripts/lib/mic/plugins/imager/direct_plugin.py index 2cbd5d11fc..ff30f09c3b 100644 --- a/scripts/lib/mic/plugins/imager/direct_plugin.py +++ b/scripts/lib/mic/plugins/imager/direct_plugin.py | |||
@@ -93,7 +93,7 @@ class DirectPlugin(ImagerPlugin): | |||
93 | try: | 93 | try: |
94 | creator.create() | 94 | creator.create() |
95 | creator.assemble() | 95 | creator.assemble() |
96 | creator.configure() | 96 | creator.finalize() |
97 | creator.print_outimage_info() | 97 | creator.print_outimage_info() |
98 | 98 | ||
99 | except errors.CreatorError: | 99 | except errors.CreatorError: |