diff options
| author |   Davis, Michael <michael.davis@essvote.com> | 2016-06-01 19:02:46 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:25 +0100 |
| commit | 59b6a03593c43d1a4c1f660c85b63a7ec337fc21 (patch) | |
| tree | 8f6b6aa83e6737a42fe194b2f79f19a0e53268e7 /meta | |
| parent | 0726b2d5cd06c2d6eecf7dbc979f2d29dda166ac (diff) | |
| download | openembedded-core-contrib-59b6a03593c43d1a4c1f660c85b63a7ec337fc21.tar.gz | |
syslinux.bbclass: Added configurable SYSLINUX_ALLOWOPTIONS variable
The new variable allows for images to be created without an
editable boot line in syslinux. Default behavior remains unchanged.
(From OE-Core rev: 935578c139a260c18e437419be82d7fd7e8be81a)
Signed-off-by: Michael Davis <michael.davis@essvote.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/syslinux.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index d4ae699375..1d310dddf2 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -30,6 +30,7 @@ SYSLINUX_SERIAL_TTY ?= "console=ttyS0,115200" SYSLINUX_PROMPT ?= "0" SYSLINUX_TIMEOUT ?= "50" AUTO_SYSLINUXMENU ?= "1" +SYSLINUX_ALLOWOPTIONS ?= "1" SYSLINUX_ROOT ?= "${ROOT}" SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg" SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg" @@ -114,7 +115,12 @@ python build_syslinux_cfg () { for opt in opts.split(';'): cfgfile.write('%s\n' % opt) - cfgfile.write('ALLOWOPTIONS 1\n'); + allowoptions = d.getVar('SYSLINUX_ALLOWOPTIONS', True) + if allowoptions: + cfgfile.write('ALLOWOPTIONS %s\n' % allowoptions) + else: + cfgfile.write('ALLOWOPTIONS 1\n') + syslinux_default_console = d.getVar('SYSLINUX_DEFAULT_CONSOLE', True) syslinux_serial_tty = d.getVar('SYSLINUX_SERIAL_TTY', True) syslinux_serial = d.getVar('SYSLINUX_SERIAL', True) |