diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-06-05 10:17:11 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:55:39 +0100 |
| commit | 4a303007149ea1205bbd454e70810e7dfa343d4c (patch) | |
| tree | 90b03fdfcbfcd53e8c64d09692ab8767a9aad2fe /scripts/lib/wic/plugins/source/bootimg-efi.py | |
| parent | 2cae0473971ff3983c7e423c23215b342c7dad1d (diff) | |
| download | openembedded-core-contrib-4a303007149ea1205bbd454e70810e7dfa343d4c.tar.gz | |
wic: Refactored getting root device name
Replaced DirectImageCreator._get_boot_config private method
with a 'rootdev' property.
Simplified the code and API.
Used 'uuid' property instead of incorrectly used 'part_type'.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-efi.py')
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 400e3a2df8..39ce9f375e 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -47,7 +47,6 @@ class BootimgEFIPlugin(SourcePlugin): else: splashline = "" - (rootdev, root_part_uuid) = cr._get_boot_config() options = cr.ks.handler.bootloader.appendLine grubefi_conf = "" @@ -62,7 +61,7 @@ class BootimgEFIPlugin(SourcePlugin): kernel = "/bzImage" if cr.ptable_format in ('msdos', 'gpt'): - rootstr = rootdev + rootstr = cr.rootdev else: raise ImageError("Unsupported partition table format found") @@ -87,7 +86,6 @@ class BootimgEFIPlugin(SourcePlugin): install_cmd = "install -d %s/loader/entries" % hdddir exec_cmd(install_cmd) - (rootdev, root_part_uuid) = cr._get_boot_config() options = cr.ks.handler.bootloader.appendLine timeout = kickstart.get_timeout(cr.ks) @@ -107,7 +105,7 @@ class BootimgEFIPlugin(SourcePlugin): kernel = "/bzImage" if cr.ptable_format in ('msdos', 'gpt'): - rootstr = rootdev + rootstr = cr.rootdev else: raise ImageError("Unsupported partition table format found") |