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:59:12 +0100 |
commit | c3148c6199756439d1802555b45249066eb7e6cf (patch) | |
tree | 67b8736c180038e91752ad4110234280eac69ffb /scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | |
parent | 5b4ab4e4be2622a8d546dfd38de58bfd72cd4831 (diff) | |
download | poky-c3148c6199756439d1802555b45249066eb7e6cf.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'.
(From OE-Core rev: 4a303007149ea1205bbd454e70810e7dfa343d4c)
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>
Diffstat (limited to 'scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 50b221382c..90dac05dca 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | |||
@@ -82,7 +82,6 @@ class RootfsPlugin(SourcePlugin): | |||
82 | 82 | ||
83 | Called before do_prepare_partition() | 83 | Called before do_prepare_partition() |
84 | """ | 84 | """ |
85 | rootdev = image_creator._get_boot_config()[0] | ||
86 | options = image_creator.ks.handler.bootloader.appendLine | 85 | options = image_creator.ks.handler.bootloader.appendLine |
87 | 86 | ||
88 | syslinux_conf = "" | 87 | syslinux_conf = "" |
@@ -102,7 +101,7 @@ class RootfsPlugin(SourcePlugin): | |||
102 | syslinux_conf += " KERNEL /boot/bzImage\n" | 101 | syslinux_conf += " KERNEL /boot/bzImage\n" |
103 | 102 | ||
104 | if image_creator.ptable_format in ('msdos', 'gpt'): | 103 | if image_creator.ptable_format in ('msdos', 'gpt'): |
105 | rootstr = rootdev | 104 | rootstr = image_creator.rootdev |
106 | else: | 105 | else: |
107 | raise ImageError("Unsupported partition table format found") | 106 | raise ImageError("Unsupported partition table format found") |
108 | 107 | ||