summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/syslinux.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 1569074b21..33a509d735 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -136,10 +136,6 @@ python build_syslinux_cfg () {
136 except OSError: 136 except OSError:
137 raise bb.build.funcFailed('Unable to open %s' % (cfile)) 137 raise bb.build.funcFailed('Unable to open %s' % (cfile))
138 138
139 # FIXME - the timeout should be settable
140 # And maybe the default too
141 # Definately the prompt
142
143 cfgfile.write('# Automatically created by OE\n') 139 cfgfile.write('# Automatically created by OE\n')
144 140
145 opts = d.getVar('SYSLINUX_OPTS', 1) 141 opts = d.getVar('SYSLINUX_OPTS', 1)
@@ -158,7 +154,11 @@ python build_syslinux_cfg () {
158 else: 154 else:
159 cfgfile.write('TIMEOUT 50\n') 155 cfgfile.write('TIMEOUT 50\n')
160 156
161 cfgfile.write('PROMPT 1\n') 157 prompt = d.getVar('SYSLINUX_PROMPT', 1)
158 if prompt:
159 cfgfile.write('PROMPT %s\n' % prompt)
160 else:
161 cfgfile.write('PROMPT 1\n')
162 162
163 menu = d.getVar('AUTO_SYSLINUXMENU', 1) 163 menu = d.getVar('AUTO_SYSLINUXMENU', 1)
164 164