diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-01-14 14:12:56 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 11:47:06 +0000 |
| commit | 4d5d5dd428e8d8fa0e155988286f3b45f47e1544 (patch) | |
| tree | 7870f309f56ca9cc804640416c86d8dc880ff7db /scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | |
| parent | 26fb2a1a45049fd5731ae83efb962a84afb14568 (diff) | |
| download | openembedded-core-contrib-4d5d5dd428e8d8fa0e155988286f3b45f47e1544.tar.gz | |
wic: get rid of get_timeout getter
Used bootloader.timeout instead of kickstart.get_timeout getter.
Accessing attributes instead of getting them with getters is
more pythonic, shorter and readable. It also more consistent as
most of partition and bootloader attributes are used this way.
This change also takes care of appendLine bootloader attribute:
it's renamed to bootloader.append attribute provided by new parser.
(From OE-Core rev: 8088caeff5bf4ee9279b47a69c9f1e5537909601)
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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 4280ff7f3e..bdf1b54cb2 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -83,10 +83,7 @@ class RootfsPlugin(SourcePlugin): syslinux_conf = "" syslinux_conf += "PROMPT 0\n" - timeout = kickstart.get_timeout(image_creator.ks) - if not timeout: - timeout = 0 - syslinux_conf += "TIMEOUT " + str(timeout) + "\n" + syslinux_conf += "TIMEOUT " + str(bootloader.timeout) + "\n" syslinux_conf += "ALLOWOPTIONS 1\n" # Derive SERIAL... line from from kernel boot parameters |