diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-01-14 14:12:55 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 11:47:05 +0000 |
commit | 26fb2a1a45049fd5731ae83efb962a84afb14568 (patch) | |
tree | 13f27e849210b55e1b540c902da63cb325bfb574 /scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | |
parent | c8272380ceed8dd56237995eecbaca5f4c9645dd (diff) | |
download | poky-26fb2a1a45049fd5731ae83efb962a84afb14568.tar.gz |
wic: adjust code for new data structure
New data structure is less nested than old one.
Adjusted bootloader and partitions fields:
self.ks.handler.bootloader -> self.ks.bootoader
self.ks.handler.partitions -> self.ks.partitions
(From OE-Core rev: b46da0731e3f7016d0ab2a67967f07c7e199f219)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.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 | 4 |
1 files changed, 2 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 76e7b033fb..4280ff7f3e 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | |||
@@ -78,7 +78,7 @@ class RootfsPlugin(SourcePlugin): | |||
78 | 78 | ||
79 | Called before do_prepare_partition() | 79 | Called before do_prepare_partition() |
80 | """ | 80 | """ |
81 | options = image_creator.ks.handler.bootloader.appendLine | 81 | bootloader = image_creator.ks.bootloader |
82 | 82 | ||
83 | syslinux_conf = "" | 83 | syslinux_conf = "" |
84 | syslinux_conf += "PROMPT 0\n" | 84 | syslinux_conf += "PROMPT 0\n" |
@@ -97,7 +97,7 @@ class RootfsPlugin(SourcePlugin): | |||
97 | syslinux_conf += " KERNEL /boot/bzImage\n" | 97 | syslinux_conf += " KERNEL /boot/bzImage\n" |
98 | 98 | ||
99 | syslinux_conf += " APPEND label=boot root=%s %s\n" % \ | 99 | syslinux_conf += " APPEND label=boot root=%s %s\n" % \ |
100 | (image_creator.rootdev, options) | 100 | (image_creator.rootdev, bootloader.append) |
101 | 101 | ||
102 | syslinux_cfg = os.path.join(image_creator.rootfs_dir['ROOTFS_DIR'], "boot", "syslinux.cfg") | 102 | syslinux_cfg = os.path.join(image_creator.rootfs_dir['ROOTFS_DIR'], "boot", "syslinux.cfg") |
103 | msger.debug("Writing syslinux config %s" % syslinux_cfg) | 103 | msger.debug("Writing syslinux config %s" % syslinux_cfg) |