summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source/bootimg-pcbios.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-06-05 10:17:11 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:12 +0100
commitc3148c6199756439d1802555b45249066eb7e6cf (patch)
tree67b8736c180038e91752ad4110234280eac69ffb /scripts/lib/wic/plugins/source/bootimg-pcbios.py
parent5b4ab4e4be2622a8d546dfd38de58bfd72cd4831 (diff)
downloadpoky-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/bootimg-pcbios.py')
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 1c3c6e605c..dd49480141 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -83,7 +83,6 @@ class BootimgPcbiosPlugin(SourcePlugin):
83 else: 83 else:
84 splashline = "" 84 splashline = ""
85 85
86 (rootdev, root_part_uuid) = cr._get_boot_config()
87 options = cr.ks.handler.bootloader.appendLine 86 options = cr.ks.handler.bootloader.appendLine
88 87
89 syslinux_conf = "" 88 syslinux_conf = ""
@@ -105,7 +104,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
105 syslinux_conf += "KERNEL " + kernel + "\n" 104 syslinux_conf += "KERNEL " + kernel + "\n"
106 105
107 if cr.ptable_format in ('msdos', 'gpt'): 106 if cr.ptable_format in ('msdos', 'gpt'):
108 rootstr = rootdev 107 rootstr = cr.rootdev
109 else: 108 else:
110 raise ImageError("Unsupported partition table format found") 109 raise ImageError("Unsupported partition table format found")
111 110