CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

syslinux: Use SYSLINUX_TIMEOUT and SYSLINUX_PROMPT to configure syslinux

Browse Source 
syslinux allows you to set TIMEOUT and PROMPT variables, when PROMPT is 0,
the "boot:" is not displayed uless one presses CTRL or SHIFT during startup.
TIMEOUT is in 1/10th of seconds, and a value of 0 for TIMEOUT will disable
the timeout mechanism.

In bitbake, recipes had set TIMEOUT (not SYSLINUX_TIMEOUT) incorrectly, other
patches fix this issues.  We are adding SYSLINUX_PROMPT to enable/disable the
"boot:" prompt in syslinux.

See http://www.syslinux.org/wiki/index.php/SYSLINUX for more details

(From OE-Core rev: be04e3b2e13c1a7e1cd5416771b72a80ec52b8ad)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2012-02-13 21:29:55 -08:00 committed by Richard Purdie
parent dced0c16e8
commit 4fe569e949
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta/classes/syslinux.bbclass
View File

@ -136,10 +136,6 @@ python build_syslinux_cfg () {
except OSError:
raise bb.build.funcFailed('Unable to open %s' % (cfile))
# FIXME - the timeout should be settable
# And maybe the default too
# Definately the prompt
cfgfile.write('# Automatically created by OE\n')
opts = d.getVar('SYSLINUX_OPTS', 1)
@ -158,7 +154,11 @@ python build_syslinux_cfg () {
else:
cfgfile.write('TIMEOUT 50\n')
cfgfile.write('PROMPT 1\n')
prompt = d.getVar('SYSLINUX_PROMPT', 1)
if prompt:
cfgfile.write('PROMPT %s\n' % prompt)
else:
cfgfile.write('PROMPT 1\n')
menu = d.getVar('AUTO_SYSLINUXMENU', 1)